From 49d2bce6e92d295904d49babf5942c73ccc791fa Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 7 Apr 2026 19:28:06 -0700 Subject: [PATCH 1/3] Remove CBWR constants which are being dropped by MKL --- mkl/_mkl_service.pxd | 5 ----- mkl/_mkl_service.pyx | 18 ------------------ mkl/tests/test_mkl_service.py | 6 ------ 3 files changed, 29 deletions(-) diff --git a/mkl/_mkl_service.pxd b/mkl/_mkl_service.pxd index 8acb4e4..134f633 100644 --- a/mkl/_mkl_service.pxd +++ b/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 diff --git a/mkl/_mkl_service.pyx b/mkl/_mkl_service.pyx index b8600cb..9123216 100644 --- a/mkl/_mkl_service.pyx +++ b/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", diff --git a/mkl/tests/test_mkl_service.py b/mkl/tests/test_mkl_service.py index 22b2e60..630d235 100644 --- a/mkl/tests/test_mkl_service.py +++ b/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", ] From 57e5110fbf19f6c079f192ac968b21f90cee096b Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Tue, 7 Apr 2026 19:28:17 -0700 Subject: [PATCH 2/3] Add gh-173 to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5894b83..a9c36a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed * Dropped support for Python 3.9 [gh-118](https://github.com/IntelPython/mkl-service/pull/118) +* Dropped support for `"ssse3"`, `"sse4_1"`, `"avx"`, `"avx512_mic"`, `"avx512_mic,strict"`, and `"avx512_mic_e1"` cbwr branches [gh-173](https://github.com/IntelPython/mkl-service/pull/173) ## [2.6.1] (11/25/2025) From 95b29f9b152248a74117218f77ecfeb6141d5482 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Wed, 8 Apr 2026 09:32:24 -0700 Subject: [PATCH 3/3] remove ISA constants that pertain to removed CBWR (CNR) constants --- mkl/_mkl_service.pxd | 3 --- mkl/_mkl_service.pyx | 3 --- mkl/tests/test_mkl_service.py | 12 ------------ 3 files changed, 18 deletions(-) diff --git a/mkl/_mkl_service.pxd b/mkl/_mkl_service.pxd index 134f633..ea22e1c 100644 --- a/mkl/_mkl_service.pxd +++ b/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 diff --git a/mkl/_mkl_service.pyx b/mkl/_mkl_service.pyx index 9123216..3b59b08 100644 --- a/mkl/_mkl_service.pyx +++ b/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, }, } diff --git a/mkl/tests/test_mkl_service.py b/mkl/tests/test_mkl_service.py index 630d235..7c9c97a 100644 --- a/mkl/tests/test_mkl_service.py +++ b/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")