Skip to content

Commit ee32e31

Browse files
ndgrigorianndgrigorian
committed
Merge branch 'master' into use-meson-build
2 parents 2ab1e4a + a07ed28 commit ee32e31

7 files changed

Lines changed: 27 additions & 18 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
4848
4949
- name: Cache conda packages
50-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
50+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
5151
env:
5252
CACHE_NUMBER: 0 # Increase to reset cache
5353
with:
@@ -77,7 +77,7 @@ jobs:
7777
conda-recipe-cf
7878
7979
- name: Upload artifact
80-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
80+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8181
with:
8282
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
8383
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -129,7 +129,7 @@ jobs:
129129
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
130130
131131
- name: Cache conda packages
132-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
132+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
133133
env:
134134
CACHE_NUMBER: 0 # Increase to reset cache
135135
with:
@@ -195,7 +195,7 @@ jobs:
195195
conda list -n base
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: 3 # Increase to reset cache
201201
with:
@@ -216,7 +216,7 @@ jobs:
216216
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> "$GITHUB_ENV"
217217
218218
- name: Upload artifact
219-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
219+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
220220
with:
221221
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
222222
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -296,7 +296,7 @@ jobs:
296296
run: Get-Content -Path .\lockfile
297297

298298
- name: Cache conda packages
299-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
299+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
300300
env:
301301
CACHE_NUMBER: 0 # Increase to reset cache
302302
with:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
3737
3838
- name: Cache conda packages
39-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
39+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4040
env:
4141
CACHE_NUMBER: 0 # Increase to reset cache
4242
with:
@@ -66,7 +66,7 @@ jobs:
6666
conda-recipe
6767
6868
- name: Upload artifact
69-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
69+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7070
with:
7171
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
7272
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
@@ -128,7 +128,7 @@ jobs:
128128
echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
129129
130130
- name: Cache conda packages
131-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
131+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
132132
env:
133133
CACHE_NUMBER: 0 # Increase to reset cache
134134
with:
@@ -184,7 +184,7 @@ jobs:
184184
conda list -n base
185185
186186
- name: Cache conda packages
187-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
187+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
188188
env:
189189
CACHE_NUMBER: 3 # Increase to reset cache
190190
with:
@@ -205,7 +205,7 @@ jobs:
205205
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> "$GITHUB_ENV"
206206
207207
- name: Upload artifact
208-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
208+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
209209
with:
210210
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
211211
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
@@ -284,7 +284,7 @@ jobs:
284284
run: Get-Content -Path .\lockfile
285285

286286
- name: Cache conda packages
287-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
287+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
288288
env:
289289
CACHE_NUMBER: 0 # Increase to reset cache
290290
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
@@ -38,7 +38,7 @@ jobs:
3838
run: pre-commit autoupdate
3939

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

‎.pre-commit-config.yaml‎

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

5454
- repo: https://github.com/pre-commit/mirrors-clang-format
55-
rev: v22.1.2
55+
rev: v22.1.3
5656
hooks:
5757
- id: clang-format
5858
args: ["-i"]

‎CHANGELOG.md‎

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

77
## [dev] - YYYY-MM-DD
88

9+
### Added
10+
11+
### Changed
12+
13+
### Fixed
14+
15+
## [2.2.0] - 2026-04-16
16+
917
### Added
1018
* Added `mkl_fft` patching for NumPy, with `mkl_fft` context manager, `is_patched` query, and `patch_numpy_fft` and `restore_numpy_fft` calls to replace `numpy.fft` calls with calls from `mkl_fft.interfaces.numpy_fft` [gh-224](https://github.com/IntelPython/mkl_fft/pull/224), [gh-295](https://github.com/IntelPython/mkl_fft/pull/295)
1119

1220
### Changed
1321
* In `mkl_fft.fftn` and `mkl_fft.ifftn`, improved checking of the shape argument `s` to use faster direct transforms more often. This makes performance more consistent between `mkl_fft.fftn/ifftn` and `mkl.interfaces`. [gh-283](https://github.com/IntelPython/mkl_fft/pull/283)
1422
* Made conda recipe dependency on numpy configurable through `USE_NUMPY_BASE` environment variable [gh-299](https://github.com/IntelPython/mkl_fft/pull/299)
23+
* Made `mkl-service` an optional dependency [gh-305](https://github.com/IntelPython/mkl_fft/pull/305)
1524

1625
### Removed
1726
* Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243)
@@ -43,7 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4352
* Dropped support for `overwrite_x` parameter in `mkl_fft` [gh-185](https://github.com/IntelPython/mkl_fft/pull/185)
4453
* Replaced `fwd_scale` parameter with `norm` in `mkl_fft` [gh-189](https://github.com/IntelPython/mkl_fft/pull/189)
4554
* Conditionally import `scipy_fft` only if `scipy` is installed [gh-195](https://github.com/IntelPython/mkl_fft/pull/195)
46-
* Vendor `fftfreq`, `rfftfreq`, `fftshift`, and `ifftshift` to `scipy_fft` and `numpy_fft` interfaces [gh-226](https://github.com/IntelPython/mkl_fft/pull/226), [gh=229](https://github.com/IntelPython/mkl_fft/pull/229)
55+
* Vendor `fftfreq`, `rfftfreq`, `fftshift`, and `ifftshift` to `scipy_fft` and `numpy_fft` interfaces [gh-226](https://github.com/IntelPython/mkl_fft/pull/226), [gh-229](https://github.com/IntelPython/mkl_fft/pull/229)
4756

4857
### Fixed
4958
* Fixed a bug for N-D FFTs when both `s` and `out` are given [gh-185](https://github.com/IntelPython/mkl_fft/pull/185)

‎mkl_fft/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.2.0dev7"
1+
__version__ = "2.3.0dev0"

0 commit comments

Comments
 (0)