Remove CBWR constants which are being dropped by MKL

Author: ndgrigorian

mkl/_mkl_service.pxd

@@ -55,14 +55,9 @@ cdef extern from "mkl.h":
     int MKL_CBWR_AUTO
     int MKL_CBWR_COMPATIBLE
     int MKL_CBWR_SSE2
-    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_AVX512_MIC_E1
     int MKL_CBWR_AVX512_E1
 
     int MKL_CBWR_SUCCESS

mkl/_mkl_service.pyx

@@ -677,17 +677,11 @@ cdef object __cbwr_set(branch=None) except *:
             "auto": mkl.MKL_CBWR_AUTO,
             "compatible": mkl.MKL_CBWR_COMPATIBLE,
             "sse2": mkl.MKL_CBWR_SSE2,
-            "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,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,
         },
@@ -720,17 +714,11 @@ cdef inline __cbwr_get(cnr_const=None) except *:
             mkl.MKL_CBWR_AUTO: "auto",
             mkl.MKL_CBWR_COMPATIBLE: "compatible",
             mkl.MKL_CBWR_SSE2: "sse2",
-            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_ERR_INVALID_INPUT: "err_invalid_input",
@@ -754,17 +742,11 @@ cdef object __cbwr_get_auto_branch() except *:
             mkl.MKL_CBWR_AUTO: "auto",
             mkl.MKL_CBWR_COMPATIBLE: "compatible",
             mkl.MKL_CBWR_SSE2: "sse2",
-            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/tests/test_mkl_service.py

@@ -219,21 +219,15 @@ def check_cbwr(branch, cnr_const):
     "auto",
     "compatible",
     "sse2",
-    "ssse3",
-    "sse4_1",
     "sse4_2",
-    "avx",
     "avx2",
-    "avx512_mic",
     "avx512",
-    "avx512_mic_e1",
     "avx512_e1",
 ]
 
 
 strict = [
     "avx2,strict",
-    "avx512_mic,strict",
     "avx512,strict",
     "avx512_e1,strict",
 ]