remove ISA constants that pertain to removed CBWR (CNR) constants

Author: ndgrigorian

mkl/_mkl_service.pxd

@@ -72,13 +72,10 @@ cdef extern from "mkl.h":
     int MKL_ENABLE_AVX512_E2
     int MKL_ENABLE_AVX512_E3
     int MKL_ENABLE_AVX512_E4
-    int MKL_ENABLE_AVX512_MIC_E1
     int MKL_ENABLE_AVX512_E1
     int MKL_ENABLE_AVX512
-    int MKL_ENABLE_AVX512_MIC
     int MKL_ENABLE_AVX2
     int MKL_ENABLE_AVX2_E1
-    int MKL_ENABLE_AVX
     int MKL_ENABLE_SSE4_2
 
     # MPI Implementation Constants

mkl/_mkl_service.pyx

@@ -773,12 +773,9 @@ cdef object __enable_instructions(isa=None) except *:
             "avx512_e3": mkl.MKL_ENABLE_AVX512_E3,
             "avx512_e2": mkl.MKL_ENABLE_AVX512_E2,
             "avx512_e1": mkl.MKL_ENABLE_AVX512_E1,
-            "avx512_mic_e1": mkl.MKL_ENABLE_AVX512_MIC_E1,
             "avx512": mkl.MKL_ENABLE_AVX512,
-            "avx512_mic": mkl.MKL_ENABLE_AVX512_MIC,
             "avx2_e1": mkl.MKL_ENABLE_AVX2_E1,
             "avx2": mkl.MKL_ENABLE_AVX2,
-            "avx": mkl.MKL_ENABLE_AVX,
             "sse4_2": mkl.MKL_ENABLE_SSE4_2,
         },
     }

mkl/tests/test_mkl_service.py

@@ -247,26 +247,14 @@ def test_cbwr_get_auto_branch():
     mkl.cbwr_get_auto_branch()
 
 
-def test_enable_instructions_avx512_mic_e1():
-    mkl.enable_instructions("avx512_mic_e1")
-
-
 def test_enable_instructions_avx512():
     mkl.enable_instructions("avx512")
 
 
-def test_enable_instructions_avx512_mic():
-    mkl.enable_instructions("avx512_mic")
-
-
 def test_enable_instructions_avx2():
     mkl.enable_instructions("avx2")
 
 
-def test_enable_instructions_avx():
-    mkl.enable_instructions("avx")
-
-
 def test_enable_instructions_sse4_2():
     mkl.enable_instructions("sse4_2")