renamed CBWR keywords like avx2_strict to avx2,strict, etc.

Author: oleksandr-pavlyk

mkl/_mkl_service.pyx

@@ -655,14 +655,14 @@ cdef object __cbwr_set(branch=None):
             'sse4_2': mkl.MKL_CBWR_SSE4_2,
             'avx': mkl.MKL_CBWR_AVX,
             'avx2': mkl.MKL_CBWR_AVX2,
-            'avx2_strict': mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT,
+            'avx2,strict': mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT,
             'avx512_mic': mkl.MKL_CBWR_AVX512_MIC,
-            'avx512_mic_strict': mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT,
+            'avx512_mic,strict': mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT,
             'avx512': mkl.MKL_CBWR_AVX512,
-            'avx512_strict': mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT,
+            'avx512,strict': mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT,
             'avx512_mic_e1': mkl.MKL_CBWR_AVX512_MIC_E1,
             'avx512_e1': mkl.MKL_CBWR_AVX512_E1,
-            'avx512_e1_strict': mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT,
+            'avx512_e1,strict': mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT,
         },
         'output': {
             mkl.MKL_CBWR_SUCCESS: 'success',
@@ -700,14 +700,14 @@ cdef inline __cbwr_get(cnr_const=None):
             mkl.MKL_CBWR_SSE4_2: 'sse4_2',
             mkl.MKL_CBWR_AVX: 'avx',
             mkl.MKL_CBWR_AVX2: 'avx2',
-            mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT: 'avx2_strict',
+            mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT: 'avx2,strict',
             mkl.MKL_CBWR_AVX512_MIC: 'avx512_mic',
-            mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT: 'avx512_mic_strict',
+            mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT: 'avx512_mic,strict',
             mkl.MKL_CBWR_AVX512: 'avx512',
-            mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT: 'avx512_strict',
+            mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT: 'avx512,strict',
             mkl.MKL_CBWR_AVX512_MIC_E1: 'avx512_mic_e1',
             mkl.MKL_CBWR_AVX512_E1: 'avx512_e1',
-            mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT: 'avx512_e1_strict',
+            mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT: 'avx512_e1,strict',
             mkl.MKL_CBWR_ERR_INVALID_INPUT: 'err_invalid_input',
         },
     }
@@ -736,14 +736,14 @@ cdef object __cbwr_get_auto_branch():
             mkl.MKL_CBWR_SSE4_2: 'sse4_2',
             mkl.MKL_CBWR_AVX: 'avx',
             mkl.MKL_CBWR_AVX2: 'avx2',
-            mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT: 'avx2_strict',
+            mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT: 'avx2,strict',
             mkl.MKL_CBWR_AVX512_MIC: 'avx512_mic',
-            mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT: 'avx512_mic_strict',
+            mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT: 'avx512_mic,strict',
             mkl.MKL_CBWR_AVX512: 'avx512',
-            mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT: 'avx512_strict',
+            mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT: 'avx512,strict',
             mkl.MKL_CBWR_AVX512_MIC_E1: 'avx512_mic_e1',
             mkl.MKL_CBWR_AVX512_E1: 'avx512_e1',
-            mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT: 'avx512_e1_strict',
+            mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT: 'avx512_e1,strict',
             mkl.MKL_CBWR_SUCCESS: 'success',
             mkl.MKL_CBWR_ERR_INVALID_INPUT: 'err_invalid_input',
         },

tests/test_mkl_service.py

@@ -205,14 +205,14 @@ def test_cbwr(self):
             'sse4_2',
             'avx',
             'avx2',
-            'avx2_strict',
+            'avx2,strict',
             'avx512_mic',
-            'avx512_mic_strict',
+            'avx512_mic,strict',
             'avx512',
-            'avx512_strict',
+            'avx512,strict',
             'avx512_mic_e1',
             'avx512_e1',
-            'avx512_e1_strict',
+            'avx512_e1,strict',
         ]
         for branch in branches:
             yield self.check_cbwr, branch