Skip to content

Commit 8533094

Browse files
ndgrigorianndgrigorian
committed
Merge branch 'master' into use-meson-build
2 parents 3fb7aff + 5d9224d commit 8533094

12 files changed

Lines changed: 152 additions & 46 deletions

‎.flake8‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ extend-ignore =
44
E203,
55
# line too long (in docstrings):
66
E501,
7-
# ‘from module import *’ used; unable to detect undefined names:
8-
F403,
97
# doc line too long (105 > 80 characters):
108
W505,
119
# missing docstring in public module:

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@
88

99
# Move to clang-format-22
1010
6056b26ff82dfd156708fd7d3680470d9ba3c9ce
11+
12+
# Clean up in setup.py
13+
5045ed9c6b39fa1747cdae2719477e5a596f0d3b

‎.github/workflows/conda-package-cf.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3939
4040
- name: Cache conda packages
41-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
41+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4242
env:
4343
CACHE_NUMBER: 0 # Increase to reset cache
4444
with:
@@ -74,13 +74,13 @@ jobs:
7474
conda-recipe-cf
7575
7676
- name: Upload artifact
77-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
77+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7878
with:
7979
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8080
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
8181

8282
- name: Upload wheels artifact
83-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
83+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8484
with:
8585
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
8686
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
@@ -109,7 +109,7 @@ jobs:
109109
python-version: ${{ matrix.python }}
110110

111111
- name: Cache conda packages
112-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
112+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
113113
env:
114114
CACHE_NUMBER: 3 # Increase to reset cache
115115
with:
@@ -135,13 +135,13 @@ jobs:
135135
run: conda build --no-test --python ${{ matrix.python }} -c conda-forge -c conda-forge/label/python_rc --override-channels conda-recipe-cf
136136

137137
- name: Upload artifact
138-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
138+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
139139
with:
140140
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
141141
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
142142

143143
- name: Upload wheels artifact
144-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
144+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
145145
with:
146146
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
147147
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
@@ -195,7 +195,7 @@ jobs:
195195
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
196196
197197
- name: Cache conda packages
198-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
198+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
199199
env:
200200
CACHE_NUMBER: 0 # Increase to reset cache
201201
with:
@@ -273,7 +273,7 @@ jobs:
273273
more lockfile
274274
275275
- name: Cache conda packages
276-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
276+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
277277
env:
278278
CACHE_NUMBER: 3 # Increase to reset cache
279279
with:

‎.github/workflows/conda-package.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3939
4040
- name: Cache conda packages
41-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
41+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4242
env:
4343
CACHE_NUMBER: 0 # Increase to reset cache
4444
with:
@@ -74,13 +74,13 @@ jobs:
7474
conda-recipe
7575
7676
- name: Upload artifact
77-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
77+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7878
with:
7979
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8080
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
8181

8282
- name: Upload wheels artifact
83-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
83+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8484
with:
8585
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
8686
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
@@ -109,7 +109,7 @@ jobs:
109109
python-version: ${{ matrix.python }}
110110

111111
- name: Cache conda packages
112-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
112+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
113113
env:
114114
CACHE_NUMBER: 3 # Increase to reset cache
115115
with:
@@ -135,13 +135,13 @@ jobs:
135135
run: conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge -c conda-forge/label/python_rc --override-channels conda-recipe
136136

137137
- name: Upload artifact
138-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
138+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
139139
with:
140140
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
141141
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
142142

143143
- name: Upload wheels artifact
144-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
144+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
145145
with:
146146
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
147147
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
@@ -195,7 +195,7 @@ jobs:
195195
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
196196
197197
- name: Cache conda packages
198-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
198+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
199199
env:
200200
CACHE_NUMBER: 0 # Increase to reset cache
201201
with:
@@ -273,7 +273,7 @@ jobs:
273273
more lockfile
274274
275275
- name: Cache conda packages
276-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
276+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
277277
env:
278278
CACHE_NUMBER: 3 # Increase to reset cache
279279
with:

‎.github/workflows/openssf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6262
# format to the repository Actions tab.
6363
- name: "Upload artifact"
64-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
64+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6565
with:
6666
name: SARIF file
6767
path: results.sarif
6868
retention-days: 14
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
72+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
7373
with:
7474
sarif_file: results.sarif

‎.github/workflows/pre-commit-autoupdate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: pre-commit autoupdate
3838

3939
- name: Create a PR with autoupdate changes
40-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
40+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
4141
with:
4242
commit-message: 'chore: update pre-commit hooks'
4343
add-paths: .pre-commit-config.yaml

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repos:
5050
exclude: "_vendored/conv_template.py"
5151

5252
- repo: https://github.com/pre-commit/mirrors-clang-format
53-
rev: v22.1.0
53+
rev: v22.1.3
5454
hooks:
5555
- id: clang-format
5656
args: ["-i"]

‎CHANGELOG.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [dev] (MM/DD/YYYY)
88

9+
### Added
10+
11+
### Changed
12+
13+
### Fixed
14+
15+
## [2.7.0] (04/16/2026)
16+
917
### Added
1018
* Added support for ISA constants `"avx10"` and `"avx512_e5"` and CNR constants `"avx10"` and `"avx10,strict"` [gh-175](https://github.com/IntelPython/mkl-service/pull/175)
1119

@@ -16,18 +24,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1624
* Dropped support for Python 3.9 [gh-118](https://github.com/IntelPython/mkl-service/pull/118)
1725
* 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)
1826

27+
### Fixed
28+
* Fixed Cython warnings when building `mkl-service` [gh-183](https://github.com/IntelPython/mkl-service/pull/183)
29+
* Removed use of star import in `mkl-service` initialization, which removes imported module pollution from the namespace [gh-178](https://github.com/IntelPython/mkl-service/pull/178)
30+
1931
## [2.6.1] (11/25/2025)
2032

2133
### Fixed
22-
* Fixed the run-time dependencies of `mkl-service` package to explicitly depend on a non–free-threaded (GIL-enabled) Python [gh-111](github.com/IntelPython/mkl-service/pull/111)
34+
* Fixed the run-time dependencies of `mkl-service` package to explicitly depend on a non–free-threaded (GIL-enabled) Python [gh-111](https://github.com/IntelPython/mkl-service/pull/111)
2335

2436
## [2.6.0] (10/06/2025)
2537

2638
### Added
2739
* Enabled support of Python 3.14 [gh-100](https://github.com/IntelPython/mkl-service/pull/100)
2840

2941
### Changed
30-
* Used `GIT_DESCRIBE_TAG` and `GIT_DESCRIBE_NUMBER` in `meta.yaml` instead of manual stepping the numbers [gh-98](github.com/IntelPython/mkl-service/pull/98)
42+
* Used `GIT_DESCRIBE_TAG` and `GIT_DESCRIBE_NUMBER` in `meta.yaml` instead of manually stepping the numbers [gh-98](https://github.com/IntelPython/mkl-service/pull/98)
3143

3244
## [2.5.2] (07/01/2025)
3345

‎mkl/__init__.py‎

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2424
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

26-
import sys
27-
2826
from . import _init_helper
2927

3028

@@ -34,6 +32,7 @@ def __init__(self):
3432

3533
def __enter__(self):
3634
import ctypes
35+
import sys
3736

3837
try:
3938
self.saved_rtld = sys.getdlopenflags()
@@ -46,6 +45,8 @@ def __enter__(self):
4645
del ctypes
4746

4847
def __exit__(self, *args):
48+
import sys
49+
4950
if self.saved_rtld:
5051
sys.setdlopenflags(self.saved_rtld)
5152
self.saved_rtld = None
@@ -55,9 +56,84 @@ def __exit__(self, *args):
5556
from . import _mklinit
5657

5758
del RTLD_for_MKL
58-
del sys
5959

60-
from ._py_mkl_service import *
60+
from ._py_mkl_service import (
61+
cbwr_get,
62+
cbwr_get_auto_branch,
63+
cbwr_set,
64+
disable_fast_mm,
65+
domain_get_max_threads,
66+
domain_set_num_threads,
67+
dsecnd,
68+
enable_instructions,
69+
free_buffers,
70+
get_clocks_frequency,
71+
get_cpu_clocks,
72+
get_cpu_frequency,
73+
get_dynamic,
74+
get_env_mode,
75+
get_max_cpu_frequency,
76+
get_max_threads,
77+
get_num_stripes,
78+
get_version,
79+
get_version_string,
80+
mem_stat,
81+
peak_mem_usage,
82+
second,
83+
set_dynamic,
84+
set_env_mode,
85+
set_memory_limit,
86+
set_mpi,
87+
set_num_stripes,
88+
set_num_threads,
89+
set_num_threads_local,
90+
thread_free_buffers,
91+
verbose,
92+
vml_clear_err_status,
93+
vml_get_err_status,
94+
vml_get_mode,
95+
vml_set_err_status,
96+
vml_set_mode,
97+
)
6198
from ._version import __version__
6299

100+
__all__ = [
101+
"get_version",
102+
"get_version_string",
103+
"set_num_threads",
104+
"domain_set_num_threads",
105+
"set_num_threads_local",
106+
"set_dynamic",
107+
"get_max_threads",
108+
"domain_get_max_threads",
109+
"get_dynamic",
110+
"set_num_stripes",
111+
"get_num_stripes",
112+
"second",
113+
"dsecnd",
114+
"get_cpu_clocks",
115+
"get_cpu_frequency",
116+
"get_max_cpu_frequency",
117+
"get_clocks_frequency",
118+
"free_buffers",
119+
"thread_free_buffers",
120+
"disable_fast_mm",
121+
"mem_stat",
122+
"peak_mem_usage",
123+
"set_memory_limit",
124+
"cbwr_set",
125+
"cbwr_get",
126+
"cbwr_get_auto_branch",
127+
"enable_instructions",
128+
"set_env_mode",
129+
"get_env_mode",
130+
"verbose",
131+
"set_mpi",
132+
"vml_set_mode",
133+
"vml_get_mode",
134+
"vml_set_err_status",
135+
"vml_get_err_status",
136+
"vml_clear_err_status",
137+
]
138+
63139
del _init_helper

0 commit comments

Comments
 (0)