Merge branch 'master' into dependabot/github_actions/github-actions-6be86f213b

Author: antonwolfy

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

@@ -33,10 +33,10 @@ jobs:
 
       - name: Add Intel repository
         run: |
-          wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-          sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
+          wget -qO- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
+            | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+          echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
+            | sudo tee /etc/apt/sources.list.d/oneAPI.list
           sudo apt-get update
 
       - name: Install Intel oneAPI

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

@@ -54,10 +54,6 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-
       - name: Cache conda packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         env:
@@ -70,8 +66,11 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_tag || matrix.python }}-
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
 
-      - name: Add conda to system path
-        run: echo "$CONDA"/bin >> "$GITHUB_PATH"
+      - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0
+        with:
+          miniforge-version: latest
+          activate-environment: ""
+          pkgs-dirs: ~/.conda/pkgs
 
       - name: Install conda-build
         run: conda install conda-build
@@ -92,7 +91,7 @@ jobs:
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }}
-          path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
+          path: ${{ env.CONDA }}/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
 
   test_linux:
     needs: build_linux
@@ -133,8 +132,11 @@ jobs:
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }}
 
-      - name: Add conda to system path
-        run: echo "$CONDA"/bin >> "$GITHUB_PATH"
+      - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0
+        with:
+          miniforge-version: latest
+          activate-environment: ""
+          pkgs-dirs: ~/.conda/pkgs
 
       - name: Install conda-build
         run: conda install conda-build
@@ -155,10 +157,6 @@ jobs:
       - name: Display lockfile
         run: cat lockfile
 
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-
       - name: Cache conda packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         env:

.github/workflows/conda-package.yml

@@ -54,10 +54,6 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-
       - name: Cache conda packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         env:
@@ -70,12 +66,15 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_tag || matrix.python }}-
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
 
-      - name: Add conda to system path
-        run: echo "$CONDA"/bin >> "$GITHUB_PATH"
+      - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0
+        with:
+          miniforge-version: latest
+          activate-environment: ""
+          pkgs-dirs: ~/.conda/pkgs
 
       - name: Store conda paths as envs
         run: |
-          echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> "$GITHUB_ENV"
+          echo "CONDA_BLD=$CONDA/conda-bld/linux-64/" >> "$GITHUB_ENV"
           echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> "$GITHUB_ENV"
 
       - name: Update conda
@@ -156,8 +155,11 @@ jobs:
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }}
 
-      - name: Add conda to system path
-        run: echo "$CONDA"/bin >> "$GITHUB_PATH"
+      - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0
+        with:
+          miniforge-version: latest
+          activate-environment: ""
+          pkgs-dirs: ~/.conda/pkgs
 
       - name: Update conda
         run: |
@@ -196,10 +198,6 @@ jobs:
       - name: Display lockfile
         run: cat lockfile
 
-      - name: Set pkgs_dirs
-        run: |
-          echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
-
       - name: Cache conda packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         env:

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+* `irfft` with `out=` now writes directly into `out` when the cast or zero-padded copy of a non-contiguous input has the same memory order as `out`, avoiding a temporary array and an extra copy [gh-396](https://github.com/IntelPython/mkl_fft/pull/396)
 
 ### Fixed
 

mkl_fft/_pydfti.pyx

@@ -750,8 +750,10 @@ def _c2r_fft1d_impl(
             # strides cannot be compared directly.
             # TODO: currently instead of this condition, we check both input
             # and output to be c_contig or f_contig, relax this condition
-            c_contig = x.flags.c_contiguous and out.flags.c_contiguous
-            f_contig = x.flags.f_contiguous and out.flags.f_contiguous
+            # Check x_arr, which may be a cast copy of x with a different
+            # layout (e.g. when x is non-contiguous and gets cast to complex).
+            c_contig = x_arr.flags.c_contiguous and out.flags.c_contiguous
+            f_contig = x_arr.flags.f_contiguous and out.flags.f_contiguous
             if c_contig or f_contig:
                 f_arr = <cnp.ndarray> out
             else:

mkl_fft/tests/test_fft1d.py

@@ -488,6 +488,31 @@ def test_irfft_out_strided(axis):
     assert np.all(base == -1.0)
 
 
+@pytest.mark.parametrize("order", ["C", "F"])
+@pytest.mark.parametrize("axis", [0, 1, 2])
+@pytest.mark.parametrize("dt", ["i8", "f4", "f8", "c16"])
+def test_irfft_out_strided_input_copied(dt, axis, order):
+    # x is strided, but it is cast (i8, f4, f8) or padded (c16) into a
+    # contiguous copy, whose layout decides if MKL can write into out directly
+    x = rnd.randint(-50, 50, size=(20, 33, 54)).astype(dt)
+    x = np.asarray(x, order=order)[::2, ::3, ::4]
+    n = None
+    if dt == "c16":
+        # n // 2 + 1 > x.shape[axis] forces a zero-padded copy
+        n = 2 * x.shape[axis] + 4
+    out_shape = list(x.shape)
+    out_shape[axis] = 2 * (x.shape[axis] - 1) if n is None else n
+    out_dtype = np.float32 if dt == "f4" else np.float64
+    # sentinel: catches out being returned untouched
+    out = np.full(out_shape, -1.0, dtype=out_dtype, order=order)
+    result = mkl_fft.irfft(x, n=n, axis=axis, out=out)
+    expected = np.fft.irfft(x.astype(np.complex128), n=n, axis=axis)
+
+    assert result is out
+    tol = 1e-4 if dt == "f4" else 1e-10
+    assert_allclose(result, expected, rtol=tol, atol=tol)
+
+
 @requires_numpy_2
 @pytest.mark.parametrize("dt", ["i4", "f4", "f8", "c8", "c16"])
 def test_irfft_dtype(dt):