Added new CBWR constants

Author: dmitrii-zagornyi

mkl/_mkl_service.pxd

@@ -45,26 +45,31 @@ cdef extern from "mkl.h":
     int MKL_MEM_MCDRAM
 
     # CNR Control Constants
+    int MKL_CBWR_BRANCH
+    int MKL_CBWR_ALL
+
+    int MKL_CBWR_STRICT
+
+    int MKL_CBWR_OFF
+    int MKL_CBWR_BRANCH_OFF
     int MKL_CBWR_AUTO
     int MKL_CBWR_COMPATIBLE
     int MKL_CBWR_SSE2
-    int MKL_CBWR_SSE3
     int MKL_CBWR_SSSE3
     int MKL_CBWR_SSE4_1
     int MKL_CBWR_SSE4_2
     int MKL_CBWR_AVX
     int MKL_CBWR_AVX2
     int MKL_CBWR_AVX512_MIC
     int MKL_CBWR_AVX512
-    int MKL_CBWR_STRICT
-    int MKL_CBWR_AVX512_E1
     int MKL_CBWR_AVX512_MIC_E1
-    int MKL_CBWR_BRANCH
-    int MKL_CBWR_ALL
+    int MKL_CBWR_AVX512_E1
+
     int MKL_CBWR_SUCCESS
-    int MKL_CBWR_BRANCH_OFF
+    int MKL_CBWR_ERR_INVALID_SETTINGS
     int MKL_CBWR_ERR_INVALID_INPUT
     int MKL_CBWR_ERR_UNSUPPORTED_BRANCH
+    int MKL_CBWR_ERR_UNKNOWN_BRANCH
     int MKL_CBWR_ERR_MODE_CHANGE_FAILURE
 
     # ISA Constants

mkl/_mkl_service.pyx

@@ -645,24 +645,24 @@ cdef object __cbwr_set(branch=None):
     """
     __variables = {
         'input': {
-            'off': mkl.MKL_CBWR_BRANCH_OFF,
+            'off': mkl.MKL_CBWR_OFF,
+            'branch_off': mkl.MKL_CBWR_BRANCH_OFF,
             'auto': mkl.MKL_CBWR_AUTO,
             'compatible': mkl.MKL_CBWR_COMPATIBLE,
             'sse2': mkl.MKL_CBWR_SSE2,
-            'sse3': mkl.MKL_CBWR_SSE3,
             'ssse3': mkl.MKL_CBWR_SSSE3,
             'sse4_1': mkl.MKL_CBWR_SSE4_1,
             '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,
             'avx512_mic': mkl.MKL_CBWR_AVX512_MIC,
+            'avx512_mic_strict': mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT,
             'avx512': mkl.MKL_CBWR_AVX512,
-            'avx512_e1': mkl.MKL_CBWR_AVX512_E1,
+            'avx512_strict': mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT,
             'avx512_mic_e1': mkl.MKL_CBWR_AVX512_MIC_E1,
-            'avx2,strict': mkl.MKL_CBWR_AVX2 | mkl.MKL_CBWR_STRICT,
-            'avx512_mic,strict': mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT,
-            'avx512,strict': mkl.MKL_CBWR_AVX512 | mkl.MKL_CBWR_STRICT,
-            'avx512_e1,strict': mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT,
+            'avx512_e1': mkl.MKL_CBWR_AVX512_E1,
+            'avx512_e1_strict': mkl.MKL_CBWR_AVX512_E1 | mkl.MKL_CBWR_STRICT,
         },
         'output': {
             mkl.MKL_CBWR_SUCCESS: 'success',
@@ -690,19 +690,24 @@ cdef inline __cbwr_get(cnr_const=None):
             'all': mkl.MKL_CBWR_ALL,
         },
         'output': {
-            mkl.MKL_CBWR_BRANCH_OFF: 'off',
+            mkl.MKL_CBWR_OFF: 'off',
+            mkl.MKL_CBWR_BRANCH_OFF: 'branch_off',
             mkl.MKL_CBWR_AUTO: 'auto',
             mkl.MKL_CBWR_COMPATIBLE: 'compatible',
             mkl.MKL_CBWR_SSE2: 'sse2',
-            mkl.MKL_CBWR_SSE3: 'sse3',
             mkl.MKL_CBWR_SSSE3: 'ssse3',
             mkl.MKL_CBWR_SSE4_1: 'sse4_1',
             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_AVX512_MIC: 'avx512_mic',
+            mkl.MKL_CBWR_AVX512_MIC | mkl.MKL_CBWR_STRICT: 'avx512_mic_strict',
             mkl.MKL_CBWR_AVX512: 'avx512',
-            mkl.MKL_CBWR_SUCCESS: 'success',
+            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_ERR_INVALID_INPUT: 'err_invalid_input',
         },
     }
@@ -721,17 +726,26 @@ cdef object __cbwr_get_auto_branch():
     """
     __variables = {
         'output': {
+            mkl.MKL_CBWR_OFF: 'off',
+            mkl.MKL_CBWR_BRANCH_OFF: 'branch_off',
             mkl.MKL_CBWR_AUTO: 'auto',
             mkl.MKL_CBWR_COMPATIBLE: 'compatible',
             mkl.MKL_CBWR_SSE2: 'sse2',
-            mkl.MKL_CBWR_SSE3: 'sse3',
             mkl.MKL_CBWR_SSSE3: 'ssse3',
             mkl.MKL_CBWR_SSE4_1: 'sse4_1',
             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_AVX512_MIC: 'avx512_mic',
+            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_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_SUCCESS: 'success',
+            mkl.MKL_CBWR_ERR_INVALID_INPUT: 'err_invalid_input',
         },
     }