Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-with-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ jobs:
architecture: x64

- name: Checkout repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0

Comment thread
vchamarthi marked this conversation as resolved.
Comment thread
vchamarthi marked this conversation as resolved.
- name: Install mkl-service dependencies
run: |
pip install meson-python cython cmake ninja
pip install meson-python "cython>=3.1.0" cmake ninja
Comment thread
vchamarthi marked this conversation as resolved.
Comment thread
vchamarthi marked this conversation as resolved.

- name: List oneAPI folder content
run: ls ${{ env.ONEAPI_ROOT }}/compiler
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-with-standard-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Install mkl-service dependencies
run: |
pip install meson-python cython cmake ninja mkl-devel
pip install meson-python "cython>=3.1.0" cmake ninja mkl-devel

Comment thread
vchamarthi marked this conversation as resolved.
- name: Build mkl-service
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Build conda package
Comment thread
vchamarthi marked this conversation as resolved.
Outdated
run: |
pip install --no-cache-dir meson-python ninja cmake cython
pip install --no-cache-dir meson-python ninja cmake "cython>=3.1.0"
pip install -e ".[test]" --no-build-isolation --verbose
pip list
python -m pytest -v mkl/tests
6 changes: 3 additions & 3 deletions .github/workflows/conda-package-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
Expand Down Expand Up @@ -326,7 +326,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
fetch-depth: 0
- uses: conda-incubator/setup-miniconda@8ee1f361103df19b6f8c8655fd3967a8ecb162d5 # v4.0.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/openssf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false

Expand Down Expand Up @@ -69,6 +69,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-autoupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout mkl-service repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Set up python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
# use commit hash to make "no-commit-to-branch" check passing
ref: ${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repos:
- tomli

- repo: https://github.com/psf/black
rev: 26.3.1
rev: 26.5.1
hooks:
- id: black
exclude: "_vendored/conv_template.py"
Expand Down
4 changes: 1 addition & 3 deletions conda-recipe-cf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ requirements:
- cmake
- ninja
- python
- python-gil # [py>=314]
- pip >=25.0
- mkl-devel # [not osx]
- mkl-devel <2024 # [osx]
- cython
- cython >=3.1.0
- wheel >=0.45.1
run:
- python
- python-gil # [py>=314]
- {{ pin_compatible('mkl') }}

test:
Expand Down
4 changes: 1 addition & 3 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ requirements:
- cmake
- ninja
- python
- python-gil # [py>=314]
- python-build
Comment thread
vchamarthi marked this conversation as resolved.
Outdated
- pip >=25.0
- mkl-devel
- cython
- cython >=3.1.0
- wheel >=0.45.1
run:
- python
- python-gil # [py>=314]
- {{ pin_compatible('mkl') }}

test:
Expand Down
6 changes: 6 additions & 0 deletions mkl/_mklinitmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ PyMODINIT_FUNC PyInit__mklinit(void)
return NULL;
}

#ifdef Py_GIL_DISABLED
/* Declare that this module supports running without the GIL so the
* free-threaded interpreter does not re-enable it on import. */
PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
#endif

return m;
}
#else
Expand Down
1 change: 1 addition & 0 deletions mkl/_py_mkl_service.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

# distutils: language = c
# cython: language_level=3
# cython: freethreading_compatible=True

import numbers
import warnings
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-backend = "mesonpy"
requires = [
"meson-python>=0.13.0",
"ninja",
"Cython",
"Cython>=3.1.0",
"mkl-devel",
"cmake"
]
Expand Down
Loading