Merge latest bug fixes from release/1.3.x into main

.github/workflows/ci.yaml

@@ -42,9 +42,9 @@ jobs:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@v4
       - name: Setup MPI
-        uses: mpi4py/setup-mpi@40c19a60792debf8ca403a3e6ee5f84c4e76555d # v1.2.1
+        uses: mpi4py/setup-mpi@v1.2.0
         with:
           mpi: ${{ matrix.mpi }}
       - name: Use Python ${{ matrix.py-version }}

.github/workflows/latest-pytorch-support.yml

@@ -1,14 +1,14 @@
 name: Support latest PyTorch
 
 on:
-  push:
-    branches:
-      - 'support/new-pytorch-release-branch'
-      - 'support/new-pytorch-main-branch'
-    paths:
-      - '.github/pytorch-release-versions/*'
-env:
-  working_branch: ${{ github.ref }}
+  workflow_call:
+    inputs:
+      working_branch:
+        required: true
+        type: string
+      base_branch:
+        required: true
+        type: string
 permissions:
   contents: write
   issues: write
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          ref: '${{ env.working_branch }}'
+          ref: '${{ inputs.working_branch }}'
       - name: Set env variables
         run: |
           echo "previous_pytorch=$(grep 'torch>=' setup.py | awk -F '<' '{print $2}' | tr -d '",')" >> $GITHUB_ENV
@@ -49,22 +49,15 @@ jobs:
       - name: Update setup.py
         run: |
           sed -i '/torch>=/ s/'"${{ env.previous_pytorch }}"'/'"${{ env.setup_pytorch }}"'/g' setup.py
-      - name: Define base branch
-        run: |
-          if [[ ${{ github.ref }} =~ .*main.* ]]; then
-            echo "base_branch=main" >> $GITHUB_ENV
-          elif [[ ${{ github.ref }} =~ .*release.* ]]; then
-            echo "base_branch=release/1.2.x" >> $GITHUB_ENV
-          fi
       - name: Create PR from branch
         uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v4.2.4
         with:
-            base: ${{ env.base_branch }}
-            branch: ${{ env.working_branch }}
+            base: ${{ inputs.base_branch }}
+            branch: ${{ inputs.working_branch }}
             delete-branch: true
             token: ${{ secrets.GITHUB_TOKEN }}
             commit-message: Support latest PyTorch release
-            title: Support PyTorch ${{ env.new_pytorch }} on branch ${{ env.base_branch }}
+            title: Support PyTorch ${{ env.new_pytorch }} on branch ${{ inputs.base_branch }}
             body: |
               Run tests on latest PyTorch release
               Issue/s resolved: #${{ steps.create-issue.outputs.number }}

.github/workflows/pytorch-latest-release.yml

@@ -2,10 +2,12 @@ name: Get latest PyTorch version release branch
 on:
   workflow_dispatch:
 env:
-  working_branch: support/new-pytorch-release-branch
-  base_branch: release/1.2.x
+  working_branch: support/new-pytorch-${{ github.ref_name }}
+  base_branch: ${{ github.ref_name }}
 permissions:
   contents: write
+  issues: write
+  pull-requests: write
 jobs:
   get-version:
     runs-on: ubuntu-latest
@@ -37,3 +39,9 @@ jobs:
           git config --global user.email 'c.comito@fz-juelich.de@users.noreply.github.com'
           git commit -am "New PyTorch release ${{ env.new }}"
           git push --set-upstream origin ${{ env.working_branch }}
+  call-workflow:
+    needs: get-version
+    uses: ./.github/workflows/latest-pytorch-support.yml
+    with:
+      working_branch: support/new-pytorch-${{ github.ref_name }}
+      base_branch: ${{ github.ref_name }}

heat/fft/fft.py

@@ -149,12 +149,25 @@ def __fftn_op(x: DNDarray, fftn_op: callable, **kwargs) -> DNDarray:
     output_shape = list(x.shape)
     shift_op = fftn_op in [torch.fft.fftshift, torch.fft.ifftshift]
     inverse_real_op = fftn_op in [torch.fft.irfftn, torch.fft.irfft2]
-    real_to_generic_fftn_ops = {
-        torch.fft.rfftn: torch.fft.fftn,
-        torch.fft.rfft2: torch.fft.fft2,
-        torch.fft.ihfftn: torch.fft.ifftn,
-        torch.fft.ihfft2: torch.fft.ifft2,
-    }
+
+    torch_has_ihfftn = hasattr(torch.fft, "ihfftn")
+
+    if torch_has_ihfftn:
+        real_to_generic_fftn_ops = {
+            torch.fft.rfftn: torch.fft.fftn,
+            torch.fft.rfft2: torch.fft.fft2,
+            torch.fft.ihfftn: torch.fft.ifftn,
+            torch.fft.ihfft2: torch.fft.ifft2,
+        }
+    else:
+        real_to_generic_fftn_ops = {
+            torch.fft.rfftn: torch.fft.fftn,
+            torch.fft.rfft2: torch.fft.fft2,
+        }
+        if "ihfft2" in str(fftn_op) or "ihfftn" in str(fftn_op):
+            raise NotImplementedError(
+                "n-dim inverse Hermitian FFTs not implemented for torch < 1.11.0. Please upgrade torch."
+            )
     real_op = fftn_op in real_to_generic_fftn_ops
 
     # sanitize kwargs

heat/fft/tests/test_fft.py

@@ -1,9 +1,12 @@
 import numpy as np
 import torch
+import unittest
 
 import heat as ht
 from heat.core.tests.test_suites.basic_test import TestCase
 
+torch_ihfftn = hasattr(torch.fft, "ihfftn")
+
 
 class TestFFT(TestCase):
     def test_fft_ifft(self):
@@ -227,17 +230,25 @@ def test_hfft_ihfft(self):
 
     def test_hfft2_ihfft2(self):
         x = ht.random.randn(10, 6, 6, dtype=ht.float64)
-        inv_fft = ht.fft.ihfft2(x)
-        reconstructed_x = ht.fft.hfft2(inv_fft, s=x.shape[-2:])
-        self.assertTrue(ht.allclose(reconstructed_x, x))
+        if torch_ihfftn:
+            inv_fft = ht.fft.ihfft2(x)
+            reconstructed_x = ht.fft.hfft2(inv_fft, s=x.shape[-2:])
+            self.assertTrue(ht.allclose(reconstructed_x, x))
+        else:
+            with self.assertRaises(NotImplementedError):
+                ht.fft.ihfft2(x)
 
     def test_hfftn_ihfftn(self):
         x = ht.random.randn(10, 6, 6, dtype=ht.float64)
-        inv_fft = ht.fft.ifftn(x)
-        reconstructed_x = ht.fft.hfftn(inv_fft, s=x.shape)
-        self.assertTrue(ht.allclose(reconstructed_x, x))
-        reconstructed_x_no_s = ht.fft.hfftn(inv_fft)
-        self.assertEqual(reconstructed_x_no_s.shape[-1], 2 * (inv_fft.shape[-1] - 1))
+        if torch_ihfftn:
+            inv_fft = ht.fft.ihfftn(x)
+            reconstructed_x = ht.fft.hfftn(inv_fft, s=x.shape)
+            self.assertTrue(ht.allclose(reconstructed_x, x))
+            reconstructed_x_no_s = ht.fft.hfftn(inv_fft)
+            self.assertEqual(reconstructed_x_no_s.shape[-1], 2 * (inv_fft.shape[-1] - 1))
+        else:
+            with self.assertRaises(NotImplementedError):
+                ht.fft.ihfftn(x)
 
     def test_rfft_irfft(self):
         # n-D distributed