added build scripts, fixed tests to not assume larger number of cores

Author: oleksandr-pavlyk

.travis.yml

@@ -2,11 +2,13 @@ matrix:
     include:
         - name: "Linux-Py2"
           os: linux
+          dist: xenial
           env:
             - MINICONDA=Miniconda2-latest-Linux-x86_64.sh
             - PYVER="--python=27"
         - name: "Linux-Py3"
           os: linux
+          dist: xenial
           env:
             - MINICONDA=Miniconda3-latest-Linux-x86_64.sh
             - PYVER=""
@@ -41,4 +43,4 @@ install:
   - g++ -v
 
 script:
-  - conda build -c intel -c conda-forge $PYVER conda-recipe
+  - conda build -c intel -c conda-forge -c defaults $PYVER conda-recipe

conda-recipe/bld.bat

@@ -0,0 +1,4 @@
+@rem Remember to activate Intel Compiler, or remoe these two lines to ise Microsoft Visual Studio compiler
+
+%PYTHON% setup.py build --force install --old-and-unmanageable
+if errorlevel 1 exit 1

conda-recipe/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -x
+
+# make sure that compiler has been sourced, if necessary
+
+CFLAGS="-I${PREFIX}/include ${CFLAGS}" $PYTHON setup.py build --force install --old-and-unmanageable

conda-recipe/meta.yaml

@@ -20,9 +20,11 @@ requirements:
       - mkl-devel
       - cython
       - numpy 1.11.*
+      - six
     run:
       - python
       - mkl
+      - six
       - {{ pin_compatible('numpy') }}
 
 test:
@@ -39,7 +41,7 @@ about:
     license_file: LICENSE.txt
     description:
         Intel(R) Math Kernel Library (Intel(R) MKL) support functions are
-        subdivided into the following groups according to their purpose:
+        subdivided into the following groups according to their purpose, such as
             Version Information
             Threading Control
             Timing
@@ -51,3 +53,4 @@ about:
 extra:
   recipe-maintainers:
      - oleksandr-pavlyk
+     - dmitrii-zagornyi

tests/test_mkl_service.py

@@ -48,25 +48,29 @@ class test_threading_control():
     # https://software.intel.com/en-us/mkl-developer-reference-c-threading-control
     def test_set_num_threads(self):
         saved = mkl.get_max_threads()
-        mkl.set_num_threads(8)
-        assert(mkl.get_max_threads() == 8)
+        half_nt = int( 0.5 + saved / 2 ) 
+        mkl.set_num_threads(half_nt)
+        assert(mkl.get_max_threads() == half_nt)
         mkl.set_num_threads(saved)
 
     def test_domain_set_num_threads_blas(self):
         saved_blas_nt = mkl.domain_get_max_threads(domain='blas')
         saved_fft_nt = mkl.domain_get_max_threads(domain='fft')
         saved_vml_nt = mkl.domain_get_max_threads(domain='vml')
         # set
-        status = mkl.domain_set_num_threads(4, domain='blas')
+        blas_nt = int( (3 + saved_blas_nt)/4 )
+        fft_nt = int( (3 + 2*saved_fft_nt)/4 )
+        vml_nt = int( (3 + 3*saved_vml_nt)/4 )
+        status = mkl.domain_set_num_threads(blas_nt, domain='blas')
         assert(status == 'success')
-        status = mkl.domain_set_num_threads(5, domain='fft')
+        status = mkl.domain_set_num_threads(fft_nt, domain='fft')
         assert(status == 'success')
-        status = mkl.domain_set_num_threads(6, domain='vml')
+        status = mkl.domain_set_num_threads(vml_nt, domain='vml')
         assert(status == 'success')
         # check
-        assert(mkl.domain_get_max_threads(domain='blas') == 4)
-        assert(mkl.domain_get_max_threads(domain='fft') == 5)
-        assert(mkl.domain_get_max_threads(domain='vml') == 6)
+        assert(mkl.domain_get_max_threads(domain='blas') == blas_nt)
+        assert(mkl.domain_get_max_threads(domain='fft') == fft_nt)
+        assert(mkl.domain_get_max_threads(domain='vml') == vml_nt)
         # restore
         status = mkl.domain_set_num_threads(saved_blas_nt, domain='blas')
         assert(status == 'success')