Skip to content

Commit d0c0183

Browse files
ndgrigorianVahid Tavanashadvtavana
authored
Permit building mkl_fft with Python 3.13 (#164)
* Permit building mkl_fft with Python 3.13 Add 3.13 builds to clang workflow * include python 3.13 for all workflows * add an entry to CHANGELOG.md * address comments --------- Co-authored-by: Vahid Tavanashad <[email protected]> Co-authored-by: Vahid Tavanashad <[email protected]>
1 parent 6f66dca commit d0c0183

File tree

7 files changed

+58
-28
lines changed

7 files changed

+58
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
python: ["3.9", "3.10", "3.11", "3.12"]
16+
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1717
numpy_version: ["numpy'<2'", "numpy'>=2'"]
1818

1919
env:

‎.github/workflows/build_pip.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
python: ['3.9', '3.10', '3.11', '3.12']
25+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
2626
use_pre: ["", "--pre"]
2727

2828
steps:
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Build conda package
5555
run: |
56-
pip install --no-cache-dir cython
56+
pip install --no-cache-dir cython setuptools
5757
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
5858
echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
5959
export MKLROOT=${CONDA_PREFIX}

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

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
python: ['3.9', '3.10', '3.11', '3.12']
23+
include:
24+
- python: '3.9'
25+
numpy: '2.0'
26+
- python: '3.10'
27+
numpy: '2.2'
28+
- python: '3.11'
29+
numpy: '2.3'
30+
- python: '3.12'
31+
numpy: '2.3'
32+
- python: '3.13'
33+
numpy: '2.3'
2434
steps:
2535
- name: Cancel Previous Runs
2636
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -51,12 +61,12 @@ jobs:
5161
run: echo $CONDA/bin >> $GITHUB_PATH
5262

5363
- name: Install conda-build
54-
run: conda install conda-build python=3.12
64+
run: conda install conda-build
5565

56-
- name: Build conda package with NumPy 2.0
66+
- name: Build conda package with NumPy 2.x
5767
run: |
5868
CHANNELS="-c conda-forge --override-channels"
59-
VERSIONS="--python ${{ matrix.python }} --numpy 2.0"
69+
VERSIONS="--python ${{ matrix.python }} --numpy ${{ matrix.numpy }}"
6070
TEST="--no-test"
6171
6272
conda build \
@@ -77,8 +87,8 @@ jobs:
7787

7888
strategy:
7989
matrix:
80-
python_ver: ['3.9', '3.10', '3.11', '3.12']
81-
numpy: ['numpy"<2"', 'numpy">=2"']
90+
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
91+
numpy: ['numpy">=2"']
8292
experimental: [false]
8393
runner: [ubuntu-latest]
8494
continue-on-error: ${{ matrix.experimental }}
@@ -95,7 +105,7 @@ jobs:
95105
run: echo $CONDA/bin >> $GITHUB_PATH
96106

97107
- name: Install conda-build
98-
run: conda install conda-build python=3.12
108+
run: conda install conda-build
99109

100110
- name: Create conda channel
101111
run: |
@@ -147,7 +157,17 @@ jobs:
147157

148158
strategy:
149159
matrix:
150-
python: ['3.9', '3.10', '3.11', '3.12']
160+
include:
161+
- python: '3.9'
162+
numpy: '2.0'
163+
- python: '3.10'
164+
numpy: '2.2'
165+
- python: '3.11'
166+
numpy: '2.3'
167+
- python: '3.12'
168+
numpy: '2.3'
169+
- python: '3.13'
170+
numpy: '2.3'
151171
steps:
152172
- name: Cancel Previous Runs
153173
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -167,7 +187,7 @@ jobs:
167187
conda-remove-defaults: 'true'
168188

169189
- name: Install conda-build
170-
run: conda install -n base conda-build python=3.12
190+
run: conda install -n base conda-build
171191

172192
- name: Cache conda packages
173193
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -184,10 +204,10 @@ jobs:
184204
- name: Setup MSVC
185205
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
186206

187-
- name: Build conda package with NumPy 2.0
207+
- name: Build conda package with NumPy 2.x
188208
run: |
189209
conda activate
190-
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe-cf
210+
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf
191211
192212
- name: Store conda paths as envs
193213
shell: bash -l {0}
@@ -209,8 +229,8 @@ jobs:
209229

210230
strategy:
211231
matrix:
212-
python_ver: ['3.9', '3.10', '3.11', '3.12']
213-
numpy: ['numpy"<2"', 'numpy">=2"']
232+
python_ver: ['3.9', '3.10', '3.11', '3.12', '3.13']
233+
numpy: ['numpy">=2"']
214234
experimental: [false]
215235
runner: [windows-latest]
216236
continue-on-error: ${{ matrix.experimental }}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
python: ['3.9', '3.10', '3.11', '3.12']
23+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
2424
steps:
2525
- name: Cancel Previous Runs
2626
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -51,7 +51,7 @@ jobs:
5151
run: echo $CONDA/bin >> $GITHUB_PATH
5252

5353
- name: Install conda-build
54-
run: conda install conda-build python=3.12
54+
run: conda install conda-build
5555

5656
- name: Build conda package
5757
run: |
@@ -77,7 +77,7 @@ jobs:
7777

7878
strategy:
7979
matrix:
80-
python: ['3.9', '3.10', '3.11', '3.12']
80+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
8181
experimental: [false]
8282
runner: [ubuntu-latest]
8383
continue-on-error: ${{ matrix.experimental }}
@@ -94,7 +94,7 @@ jobs:
9494
run: echo $CONDA/bin >> $GITHUB_PATH
9595

9696
- name: Install conda-build
97-
run: conda install conda-build python=3.12
97+
run: conda install conda-build
9898

9999
- name: Create conda channel
100100
run: |
@@ -155,7 +155,7 @@ jobs:
155155

156156
strategy:
157157
matrix:
158-
python: ['3.9', '3.10', '3.11', '3.12']
158+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
159159
steps:
160160
- name: Cancel Previous Runs
161161
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
@@ -177,7 +177,7 @@ jobs:
177177
- name: Install conda-build
178178
run: |
179179
conda activate
180-
conda install -n base conda-build python=3.12
180+
conda install -n base conda-build
181181
182182
- name: Cache conda packages
183183
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -219,7 +219,7 @@ jobs:
219219

220220
strategy:
221221
matrix:
222-
python: ['3.9', '3.10', '3.11', '3.12']
222+
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
223223
experimental: [false]
224224
runner: [windows-latest]
225225
continue-on-error: ${{ matrix.experimental }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up python
1919
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2020
with:
21-
python-version: '3.12'
21+
python-version: '3.13'
2222

2323
- name: Set up pip packages
2424
uses: BSFishy/pip-action@8f2d471d809dc20b6ada98c91910b6ae6243f318 # v1

‎CHANGELOG.md‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [2.0.0] (05/DD/2025)
7+
## [dev] - YYYY-MM-DD
8+
9+
### Added
10+
* Enabled support of Python 3.13 [gh-164](https://github.com/IntelPython/mkl_fft/pull/164)
11+
12+
### Changed
13+
14+
### Fixed
15+
16+
## [2.0.0] - 2025-06-03
817

918
### Added
1019
* Added Hermitian FFT functions to SciPy interface `mkl_fft.interfaces.scipy_fft`: `hfft`, `ihfft`, `hfftn`, `ihfftn`, `hfft2`, and `ihfft2` [gh-161](https://github.com/IntelPython/mkl_fft/pull/161)
@@ -22,14 +31,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2231
* Fixed inconsistency of input and output arrays dtype for `irfft` function [gh-180](https://github.com/IntelPython/mkl_fft/pull/180)
2332
* Fixed issues with `set_workers` function in SciPy interface `mkl_fft.interfaces.scipy_fft` [gh-183](https://github.com/IntelPython/mkl_fft/pull/183)
2433

25-
## [1.3.14] (04/10/2025)
34+
## [1.3.14] - 2025-04-10
2635

2736
resolves gh-152 by adding an explicit `mkl-service` dependency to `mkl-fft` when building the wheel
2837
to ensure the `mkl` Python module is always available at runtime
2938

3039
resolves gh-115, gh-116, gh-119, gh-135
3140

32-
## [1.3.13] (03/25/2025)
41+
## [1.3.13] - 2025-03-25
3342

3443
Supported python versions are 3.9, 3.10, 3.11, 3.12
3544

‎pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ classifiers = [
4242
"Programming Language :: Python :: 3.10",
4343
"Programming Language :: Python :: 3.11",
4444
"Programming Language :: Python :: 3.12",
45+
"Programming Language :: Python :: 3.13",
4546
"Programming Language :: Python :: Implementation :: CPython",
4647
"Topic :: Software Development",
4748
"Topic :: Scientific/Engineering",
@@ -56,7 +57,7 @@ keywords = ["DFTI", "FFT", "Fourier", "MKL"]
5657
license = "BSD-3-Clause"
5758
name = "mkl_fft"
5859
readme = {file = "README.md", content-type = "text/markdown"}
59-
requires-python = ">=3.9,<3.13"
60+
requires-python = ">=3.9,<3.14"
6061

6162
[project.optional-dependencies]
6263
scipy_interface = ["scipy>=1.10"]

0 commit comments

Comments
 (0)