Skip to content

Commit ec17c41

Browse files
vchamarthivchamarthi
committed
Merge remote-tracking branch 'upstream/master' into feat/enable-free-threaded-python
2 parents 8f787d1 + 9d50203 commit ec17c41

22 files changed

Lines changed: 92 additions & 115 deletions

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Higher-precedence file overrides; lower must not restate overridden guidance.
3434
- Never include secrets/tokens/credentials in files.
3535

3636
## Source-of-truth files
37-
- Build/config: `pyproject.toml`, `setup.py`
37+
- Build/config: `pyproject.toml`, `meson.build`
3838
- Recipe/deps: `conda-recipe/meta.yaml`, `conda-recipe/conda_build_config.yaml`
3939
- CI: `.github/workflows/*.{yml,yaml}`
4040
- API contracts: `mkl/__init__.py`, `mkl/_py_mkl_service.pyx`

‎.github/workflows/build-with-clang.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ jobs:
3737
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
3838
sudo apt-get update
3939
40-
- name: Install Intel OneAPI
40+
- name: Install Intel oneAPI
4141
run: |
4242
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp
4343
sudo apt-get install intel-oneapi-mkl-devel
4444
4545
- name: Setup Python
46-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
46+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
4747
with:
4848
python-version: ${{ matrix.python }}
4949
architecture: x64
5050

5151
- name: Checkout repo
52-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
52+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5353
with:
5454
fetch-depth: 0
5555

‎.github/workflows/build-with-standard-clang.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ jobs:
5151
- name: Build mkl-service
5252
run: |
5353
export CC=${{ env.COMPILER_ROOT }}/clang
54-
pip install . --no-build-isolation --no-deps --verbose
55-
56-
- name: Run mkl-service tests
57-
run: |
58-
pip install pytest
59-
# mkl-service cannot be installed in editable mode, we need
60-
# to change directory before importing it and running tests
61-
cd ..
62-
pytest -s -v --pyargs mkl
54+
pip install -e ".[test]" --no-build-isolation --verbose
55+
pip list
56+
python -m pytest -v mkl/tests

‎.github/workflows/build_pip.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@ on:
88

99
permissions: read-all
1010

11-
env:
12-
PACKAGE_NAME: mkl-service
13-
MODULE_NAME: mkl-service
14-
TEST_ENV_NAME: test_mkl_service
15-
1611
jobs:
1712
build:
1813
runs-on: ubuntu-latest
1914
defaults:
2015
run:
21-
shell: bash -el {0}
16+
shell: bash -el {0}
2217

2318
strategy:
2419
matrix:
@@ -40,7 +35,7 @@ jobs:
4035
run: |
4136
conda install mkl-devel mkl
4237
43-
- name: Build conda package
38+
- name: Build with pip
4439
run: |
4540
pip install --no-cache-dir meson-python ninja cmake "cython>=3.1.0"
4641
pip install -e ".[test]" --no-build-isolation --verbose

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

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
access_token: ${{ github.token }}
3131

32-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
32+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3333
with:
3434
fetch-depth: 0
3535

@@ -38,7 +38,7 @@ jobs:
3838
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3939
4040
- name: Cache conda packages
41-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
41+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4242
env:
4343
CACHE_NUMBER: 0 # Increase to reset cache
4444
with:
@@ -59,7 +59,6 @@ jobs:
5959
shell: bash -el {0}
6060
run: |
6161
echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> "$GITHUB_ENV"
62-
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> "$GITHUB_ENV"
6362
6463
- name: Build conda package
6564
run: |
@@ -79,12 +78,6 @@ jobs:
7978
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8079
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
8180

82-
- name: Upload wheels artifact
83-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
84-
with:
85-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
86-
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
87-
8881
build_windows:
8982
runs-on: windows-latest
9083

@@ -98,7 +91,7 @@ jobs:
9891
with:
9992
access_token: ${{ github.token }}
10093

101-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
94+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
10295
with:
10396
fetch-depth: 0
10497
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
@@ -117,7 +110,7 @@ jobs:
117110
conda install -n base -y conda-build
118111
119112
- name: Cache conda packages
120-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
113+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
121114
env:
122115
CACHE_NUMBER: 3 # Increase to reset cache
123116
with:
@@ -132,7 +125,6 @@ jobs:
132125
shell: bash -el {0}
133126
run: |
134127
echo "CONDA_BLD=$CONDA\\conda-bld\\win-64\\" >> "$GITHUB_ENV"
135-
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE\\" >> "$GITHUB_ENV"
136128
137129
- name: Show Conda info
138130
run: |
@@ -151,12 +143,6 @@ jobs:
151143
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
152144
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
153145

154-
- name: Upload wheels artifact
155-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
156-
with:
157-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
158-
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
159-
160146
test_linux:
161147
needs: build_linux
162148
runs-on: ${{ matrix.runner }}
@@ -206,7 +192,7 @@ jobs:
206192
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
207193
208194
- name: Cache conda packages
209-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
195+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
210196
env:
211197
CACHE_NUMBER: 0 # Increase to reset cache
212198
with:
@@ -284,7 +270,7 @@ jobs:
284270
more lockfile
285271
286272
- name: Cache conda packages
287-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
273+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
288274
env:
289275
CACHE_NUMBER: 3 # Increase to reset cache
290276
with:
@@ -326,7 +312,7 @@ jobs:
326312
with:
327313
access_token: ${{ github.token }}
328314

329-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
315+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
330316
with:
331317
fetch-depth: 0
332318

@@ -338,7 +324,7 @@ jobs:
338324
python-version: ${{ matrix.python }}
339325

340326
- name: Cache conda packages
341-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
327+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
342328
env:
343329
CACHE_NUMBER: 0 # Increase to reset cache
344330
with:
@@ -359,7 +345,6 @@ jobs:
359345
shell: bash -el {0}
360346
run: |
361347
echo "CONDA_BLD=$CONDA/conda-bld/osx-64/" >> "$GITHUB_ENV"
362-
echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> "$GITHUB_ENV"
363348
364349
- name: Build conda package
365350
shell: bash -el {0}
@@ -380,12 +365,6 @@ jobs:
380365
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
381366
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
382367

383-
- name: Upload wheels artifact
384-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
385-
with:
386-
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
387-
path: ${{ env.WHEELS_OUTPUT_FOLDER }}mkl_service-*.whl
388-
389368
test_osx:
390369
needs: build_osx
391370
runs-on: ${{ matrix.runner }}
@@ -436,7 +415,7 @@ jobs:
436415
cat lockfile
437416
438417
- name: Cache conda packages
439-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
418+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
440419
env:
441420
CACHE_NUMBER: 0 # Increase to reset cache
442421
with:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
access_token: ${{ github.token }}
3131

32-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
32+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3333
with:
3434
fetch-depth: 0
3535

@@ -38,7 +38,7 @@ jobs:
3838
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3939
4040
- name: Cache conda packages
41-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
41+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4242
env:
4343
CACHE_NUMBER: 0 # Increase to reset cache
4444
with:
@@ -98,7 +98,7 @@ jobs:
9898
with:
9999
access_token: ${{ github.token }}
100100

101-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
101+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
102102
with:
103103
fetch-depth: 0
104104
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
@@ -109,7 +109,7 @@ jobs:
109109
python-version: ${{ matrix.python }}
110110

111111
- name: Cache conda packages
112-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
112+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
113113
env:
114114
CACHE_NUMBER: 3 # Increase to reset cache
115115
with:
@@ -195,7 +195,7 @@ jobs:
195195
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
196196
197197
- name: Cache conda packages
198-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
198+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
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@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
276+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
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
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
37+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3838
with:
3939
persist-credentials: false
4040

@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
72+
uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
7373
with:
7474
sarif_file: results.sarif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323

2424
steps:
2525
- name: Checkout mkl-service repo
26-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
26+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2727

2828
- name: Set up python
29-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
29+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
3030
with:
3131
python-version: '3.14'
3232

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
timeout-minutes: 30
1414
steps:
1515
- name: Checkout repo
16-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
16+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1717
with:
1818
# use commit hash to make "no-commit-to-branch" check passing
1919
ref: ${{ github.sha }}
2020

2121
- name: Set up python
22-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
22+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
2323
with:
2424
python-version: '3.12'
2525

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ repos:
3737
- id: text-unicode-replacement-char
3838

3939
- repo: https://github.com/codespell-project/codespell
40-
rev: v2.4.2
40+
rev: v2.4.3
4141
hooks:
4242
- id: codespell
4343
additional_dependencies:
@@ -50,13 +50,13 @@ repos:
5050
exclude: "_vendored/conv_template.py"
5151

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

5858
- repo: https://github.com/MarcoGorelli/cython-lint
59-
rev: v0.19.0
59+
rev: v0.21.0
6060
hooks:
6161
- id: cython-lint
6262
- id: double-quote-cython-strings
@@ -71,7 +71,7 @@ repos:
7171
- flake8-bugbear==24.4.26
7272

7373
- repo: https://github.com/pycqa/isort
74-
rev: 9.0.0a3
74+
rev: 9.0.0b1
7575
hooks:
7676
- id: isort
7777
name: isort (python)

0 commit comments

Comments
 (0)