Added tests

Author: dmitrii-zagornyi

mkl-service/_mkl_service.pyx

@@ -327,7 +327,7 @@ def set_memory_limit(limit):
 
     mkl_status = mkl.mkl_set_memory_limit(mkl.MKL_MEM_MCDRAM, limit)
 
-    status =  __mkl_int_to_str(mkl_status, __variables['output'])
+    status = __mkl_int_to_str(mkl_status, __variables['output'])
     return status
 
 
@@ -497,7 +497,7 @@ def set_mpi(vendor, custom_library_name):
             'custom': mkl.MKL_BLACS_CUSTOM,
             'msmpi': mkl.MKL_BLACS_MSMPI,
             'intelmpi': mkl.MKL_BLACS_INTELMPI,
-            #'mpich': mkl.MKL_BLACS_MPICH,
+            'mpich2': mkl.MKL_BLACS_MPICH2,
         },
         'output': {
             0: 'success',

mkl-service/tests/test_mkl_service.py

@@ -41,23 +41,23 @@ class test_threading_control():
     def test_set_num_threads(self):
         mkl.set_num_threads(8)
 
-    def test_domain_set_num_threads_str_blas(self):
+    def test_domain_set_num_threads_blas(self):
         status = mkl.domain_set_num_threads(4, domain='blas')
         assert(status == 'success')
 
-    def test_domain_set_num_threads_str_fft(self):
+    def test_domain_set_num_threads_fft(self):
         status = mkl.domain_set_num_threads(4, domain='fft')
         assert(status == 'success')
 
-    def test_domain_set_num_threads_str_vml(self):
+    def test_domain_set_num_threads_vml(self):
         status = mkl.domain_set_num_threads(4, domain='vml')
         assert(status == 'success')
 
-    def test_domain_set_num_threads_str_pardiso(self):
+    def test_domain_set_num_threads_pardiso(self):
         status = mkl.domain_set_num_threads(4, domain='pardiso')
         assert(status == 'success')
 
-    def test_domain_set_num_threads_str_all(self):
+    def test_domain_set_num_threads_all(self):
         status = mkl.domain_set_num_threads(4, domain='all')
         assert(status == 'success')
 
@@ -78,19 +78,19 @@ def test_set_dynamic(self):
     def test_get_max_threads(self):
         mkl.get_max_threads()
 
-    def test_domain_get_max_threads_str_blas(self):
+    def test_domain_get_max_threads_blas(self):
         mkl.domain_get_max_threads(domain='blas')
 
-    def test_domain_get_max_threads_str_fft(self):
+    def test_domain_get_max_threads_fft(self):
         mkl.domain_get_max_threads(domain='fft')
 
-    def test_domain_get_max_threads_str_vml(self):
+    def test_domain_get_max_threads_vml(self):
         mkl.domain_get_max_threads(domain='vml')
 
-    def test_domain_get_max_threads_str_pardiso(self):
+    def test_domain_get_max_threads_pardiso(self):
         mkl.domain_get_max_threads(domain='pardiso')
 
-    def test_domain_get_max_threads_str_all(self):
+    def test_domain_get_max_threads_all(self):
         mkl.domain_get_max_threads(domain='all')
 
     def test_get_dynamic(self):
@@ -141,16 +141,16 @@ def test_disable_fast_mm(self):
     def test_mem_stat(self):
         mkl.mem_stat()
 
-    def test_peak_mem_usage_str_enable(self):
+    def test_peak_mem_usage_enable(self):
         mkl.peak_mem_usage('enable')
 
-    def test_peak_mem_usage_str_disable(self):
+    def test_peak_mem_usage_disable(self):
         mkl.peak_mem_usage('disable')
 
-    def test_peak_mem_usage_str_peak_mem(self):
+    def test_peak_mem_usage_peak_mem(self):
         mkl.peak_mem_usage('peak_mem')
 
-    def test_peak_mem_usage_str_peak_mem_reset(self):
+    def test_peak_mem_usage_peak_mem_reset(self):
         mkl.peak_mem_usage('peak_mem_reset')
 
     def test_set_memory_limit(self):
@@ -159,77 +159,143 @@ def test_set_memory_limit(self):
 
 class test_conditional_numerical_reproducibility_control:
     # https://software.intel.com/en-us/mkl-developer-reference-c-conditional-numerical-reproducibility-control
-    def test_cbwr_set_str_auto(self):
+    def test_cbwr_set_auto(self):
         mkl.cbwr_set(branch='auto')
 
-    def test_cbwr_set_str_compatible(self):
+    def test_cbwr_set_compatible(self):
         mkl.cbwr_set(branch='compatible')
 
-    def test_cbwr_set_str_sse2(self):
+    def test_cbwr_set_sse2(self):
         mkl.cbwr_set(branch='sse2')
 
-    def test_cbwr_set_str_sse3(self):
+    def test_cbwr_set_sse3(self):
         mkl.cbwr_set(branch='sse3')
 
-    def test_cbwr_set_str_ssse3(self):
+    def test_cbwr_set_ssse3(self):
         mkl.cbwr_set(branch='ssse3')
 
-    def test_cbwr_set_str_sse4_1(self):
+    def test_cbwr_set_sse4_1(self):
         mkl.cbwr_set(branch='sse4_1')
 
-    def test_cbwr_set_str_sse4_2(self):
+    def test_cbwr_set_sse4_2(self):
         mkl.cbwr_set(branch='sse4_2')
 
-    def test_cbwr_set_str_avx(self):
+    def test_cbwr_set_avx(self):
         mkl.cbwr_set(branch='avx')
 
-    def test_cbwr_set_str_avx2(self):
+    def test_cbwr_set_avx2(self):
         mkl.cbwr_set(branch='avx2')
 
-    def test_cbwr_set_str_avx512_mic(self):
+    def test_cbwr_set_avx512_mic(self):
         mkl.cbwr_set(branch='avx512_mic')
 
-    def test_cbwr_set_str_avx512(self):
+    def test_cbwr_set_avx512(self):
         mkl.cbwr_set(branch='avx512')
 
     def test_cbwr_get(self):
         mkl.cbwr_get(cnr_const='all')
 
+    def test_cbwr_get(self):
+        mkl.cbwr_get(cnr_const='branch')
+
     def test_cbwr_get_auto_branch(self):
         mkl.cbwr_get_auto_branch()
 
 
 class test_miscellaneous():
     # https://software.intel.com/en-us/mkl-developer-reference-c-miscellaneous
-    def test_enable_instructions(self):
+    def test_enable_instructions_avx512_mic_e1(self):
+        mkl.enable_instructions('avx512_mic_e1')
+
+    def test_enable_instructions_avx512(self):
+        mkl.enable_instructions('avx512')
+
+    def test_enable_instructions_avx512_mic(self):
+        mkl.enable_instructions('avx512_mic')
+
+    def test_enable_instructions_avx2(self):
+        mkl.enable_instructions('avx2')
+
+    def test_enable_instructions_avx(self):
         mkl.enable_instructions('avx')
 
+    def test_enable_instructions_sse4_2(self):
+        mkl.enable_instructions('sse4_2')
+
     def test_set_env_mode(self):
         mkl.set_env_mode()
 
     def test_get_env_mode(self):
         mkl.get_env_mode()
 
-    def test_verbose(self):
+    def test_verbose_false(self):
         mkl.verbose(False)
 
-    def test_set_mpi(self):
+    def test_verbose_true(self):
+        mkl.verbose(True)
+
+    def test_set_mpi_custom(self):
+        mkl.set_mpi('custom', 'test')
+
+    def test_set_mpi_msmpi(self):
+        mkl.set_mpi('msmpi', 'test')
+
+    def test_set_mpi_intelmpi(self):
         mkl.set_mpi('intelmpi', 'test')
 
+    def test_set_mpi_mpich2(self):
+        mkl.set_mpi('mpich2', 'test')
+
+
 class test_vm_service_functions():
     # https://software.intel.com/en-us/mkl-developer-reference-c-vm-service-functions
-    def test_vmlSetMode(self):
+    def test_vml_set_mode_ha_on_ignore(self):
+        mkl.vml_set_mode('ha', 'on', 'ignore')
+
+    def test_vml_set_mode_ha_on_errno(self):
+        mkl.vml_set_mode('ha', 'on', 'errno')
+
+    def test_vml_set_mode_la_on_stderr(self):
         mkl.vml_set_mode('la', 'on', 'stderr')
 
-    def test_vmlGetMode(self):
+    def test_vml_set_mode_la_off_except(self):
+        mkl.vml_set_mode('la', 'off', 'except')
+
+    def test_vml_set_mode_op_off_callback(self):
+        mkl.vml_set_mode('ep', 'off', 'callback')
+
+    def test_vml_set_mode_ep_off_default(self):
+        mkl.vml_set_mode('ep', 'off', 'default')
+
+    def test_vml_get_mode(self):
         mkl.vml_get_mode()
 
-    def test_vmlSetErrStatus(self):
+    def test_vml_set_err_status_ok(self):
         mkl.vml_set_err_status('ok')
 
-    def test_vmlGetErrStatus(self):
+    def test_vml_set_err_status_accuracywarning(self):
+        mkl.vml_set_err_status('accuracywarning')
+
+    def test_vml_set_err_status_badsize(self):
+        mkl.vml_set_err_status('badsize')
+
+    def test_vml_set_err_status_badmem(self):
+        mkl.vml_set_err_status('badmem')
+
+    def test_vml_set_err_status_errdom(self):
+        mkl.vml_set_err_status('errdom')
+
+    def test_vml_set_err_status_sing(self):
+        mkl.vml_set_err_status('sing')
+
+    def test_vml_set_err_status_overflow(self):
+        mkl.vml_set_err_status('overflow')
+
+    def test_vml_set_err_status_underflow(self):
+        mkl.vml_set_err_status('underflow')
+
+    def test_vml_get_err_status(self):
         mkl.vml_get_err_status()
 
-    def test_vmlClearErrStatus(self):
+    def test_vml_clear_err_status(self):
         mkl.vml_clear_err_status()
-