Update index url and check for macos

Add check to skip mkl_fft on darwin

Minor update

Author: rohanbabbar04

pylops/signalprocessing/fft.py

@@ -22,7 +22,7 @@
     import pyfftw
 
 if mkl_fft_message is None:
-    import mkl_fft.interfaces.scipy_fft as mkl_backend
+    import mkl_fft.interfaces.numpy_fft as mkl_backend
 
 logger = logging.getLogger(__name__)
 
@@ -414,21 +414,6 @@ def __init__(
         dtype: DTypeLike = "complex128",
         **kwargs_fft,
     ) -> None:
-        if np.dtype(dtype) == np.float16:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float16 dtype. Will use float32."
-            )
-            dtype = np.float32
-        elif np.dtype(dtype) == np.complex256:
-            warnings.warn(
-                "mkl_fft backend is unavailable with complex256 dtype. Will use complex128."
-            )
-            dtype = np.complex128
-        elif np.dtype(dtype) == np.float128:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float128 dtype. Will use float64."
-            )
-            dtype = np.float64
         super().__init__(
             dims=dims,
             axis=axis,
@@ -452,12 +437,6 @@ def __init__(
 
     @reshaped
     def _matvec(self, x: NDArray) -> NDArray:
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.ifftshift_before:
             x = mkl_backend.ifftshift(x, axes=self.axis)
         if not self.clinear:
@@ -477,12 +456,6 @@ def _matvec(self, x: NDArray) -> NDArray:
 
     @reshaped
     def _rmatvec(self, x: NDArray) -> NDArray:
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.fftshift_after:
             x = mkl_backend.ifftshift(x, axes=self.axis)
         if self.real:

pylops/signalprocessing/fft2d.py

@@ -16,7 +16,7 @@
 mkl_fft_message = deps.mkl_fft_import("the mkl fft module")
 
 if mkl_fft_message is None:
-    import mkl_fft.interfaces.scipy_fft as mkl_backend
+    import mkl_fft.interfaces.numpy_fft as mkl_backend
 
 
 class _FFT2D_numpy(_BaseFFTND):
@@ -257,21 +257,6 @@ def __init__(
         dtype: DTypeLike = "complex128",
         **kwargs_fft,
     ) -> None:
-        if np.dtype(dtype) == np.float16:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float16 dtype. Will use float32."
-            )
-            dtype = np.float32
-        elif np.dtype(dtype) == np.complex256:
-            warnings.warn(
-                "mkl_fft backend is unavailable with complex256 dtype. Will use complex128."
-            )
-            dtype = np.complex128
-        elif np.dtype(dtype) == np.float128:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float128 dtype. Will use float64."
-            )
-            dtype = np.float64
         super().__init__(
             dims=dims,
             axes=axes,
@@ -305,12 +290,6 @@ def __init__(
 
     @reshaped
     def _matvec(self, x):
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.ifftshift_before.any():
             x = mkl_backend.ifftshift(x, axes=self.axes[self.ifftshift_before])
         if not self.clinear:
@@ -335,12 +314,6 @@ def _matvec(self, x):
 
     @reshaped
     def _rmatvec(self, x):
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.fftshift_after.any():
             x = mkl_backend.ifftshift(x, axes=self.axes[self.fftshift_after])
         if self.real:

pylops/signalprocessing/fftnd.py

@@ -16,7 +16,7 @@
 mkl_fft_message = deps.mkl_fft_import("the mkl fft module")
 
 if mkl_fft_message is None:
-    import mkl_fft.interfaces.scipy_fft as mkl_backend
+    import mkl_fft.interfaces.numpy_fft as mkl_backend
 
 
 class _FFTND_numpy(_BaseFFTND):
@@ -238,21 +238,6 @@ def __init__(
         dtype: DTypeLike = "complex128",
         **kwargs_fft,
     ) -> None:
-        if np.dtype(dtype) == np.float16:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float16 dtype. Will use float32."
-            )
-            dtype = np.float32
-        elif np.dtype(dtype) == np.complex256:
-            warnings.warn(
-                "mkl_fft backend is unavailable with complex256 dtype. Will use complex128."
-            )
-            dtype = np.complex128
-        elif np.dtype(dtype) == np.float128:
-            warnings.warn(
-                "mkl_fft backend is unavailable with float128 dtype. Will use float64."
-            )
-            dtype = np.float64
         super().__init__(
             dims=dims,
             axes=axes,
@@ -275,12 +260,6 @@ def __init__(
 
     @reshaped
     def _matvec(self, x: NDArray) -> NDArray:
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.ifftshift_before.any():
             x = mkl_backend.ifftshift(x, axes=self.axes[self.ifftshift_before])
         if not self.clinear:
@@ -305,12 +284,6 @@ def _matvec(self, x: NDArray) -> NDArray:
 
     @reshaped
     def _rmatvec(self, x: NDArray) -> NDArray:
-        if x.dtype == np.float16:
-            x = x.astype(np.float32)
-        elif x.dtype == np.float128:
-            x = x.astype(np.float64)
-        elif x.dtype == np.complex256:
-            x = x.astype(np.complex128)
         if self.fftshift_after.any():
             x = mkl_backend.ifftshift(x, axes=self.axes[self.fftshift_after])
         if self.real:

pytests/test_ffts.py

@@ -1,5 +1,6 @@
 import itertools
 import os
+import sys
 
 if int(os.environ.get("TEST_CUPY_PYLOPS", 0)):
     import cupy as np
@@ -322,6 +323,8 @@ def test_unknown_engine(par):
 
 @pytest.mark.parametrize("par", pars_fft_small_real)
 def test_FFT_small_real(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
 
     if backend == "numpy" or (backend == "cupy" and par["engine"] == "numpy"):
@@ -399,6 +402,8 @@ def test_FFT_small_real(par):
 )
 @pytest.mark.parametrize("par", pars_fft_random_real)
 def test_FFT_random_real(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
 
     shape = par["shape"]
@@ -455,6 +460,8 @@ def test_FFT_random_real(par):
 
 @pytest.mark.parametrize("par", pars_fft_small_cpx)
 def test_FFT_small_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     dtype, decimal = par["dtype_precision"]
     norm = par["norm"]
@@ -527,6 +534,8 @@ def test_FFT_small_complex(par):
 
 @pytest.mark.parametrize("par", pars_fft_random_cpx)
 def test_FFT_random_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     if backend == "numpy" or (backend == "cupy" and par["engine"] == "numpy"):
         shape = par["shape"]
@@ -614,6 +623,8 @@ def test_FFT_random_complex(par):
 )
 @pytest.mark.parametrize("par", pars_fft2d_random_real)
 def test_FFT2D_random_real(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     if backend == "numpy" or (backend == "cupy" and par["engine"] == "numpy"):
         shape = par["shape"]
@@ -675,6 +686,8 @@ def test_FFT2D_random_real(par):
 
 @pytest.mark.parametrize("par", pars_fft2d_random_cpx)
 def test_FFT2D_random_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     if backend == "numpy" or (backend == "cupy" and par["engine"] == "numpy"):
         shape = par["shape"]
@@ -756,6 +769,8 @@ def test_FFT2D_random_complex(par):
 
 @pytest.mark.parametrize("par", pars_fftnd_random_real)
 def test_FFTND_random_real(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     if backend == "numpy" or (backend == "cupy" and par["engine"] == "numpy"):
         shape = par["shape"]
@@ -817,6 +832,8 @@ def test_FFTND_random_real(par):
 
 @pytest.mark.parametrize("par", pars_fftnd_random_cpx)
 def test_FFTND_random_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     shape = par["shape"]
     dtype, decimal = par["dtype_precision"]
@@ -893,6 +910,8 @@ def test_FFTND_random_complex(par):
 
 @pytest.mark.parametrize("par", pars_fft2dnd_small_cpx)
 def test_FFT2D_small_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     dtype, decimal = par["dtype_precision"]
     norm = par["norm"]
@@ -943,6 +962,8 @@ def test_FFT2D_small_complex(par):
 
 @pytest.mark.parametrize("par", pars_fft2dnd_small_cpx)
 def test_FFTND_small_complex(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     dtype, decimal = par["dtype_precision"]
     norm = par["norm"]
@@ -1018,6 +1039,8 @@ def test_FFTND_small_complex(par):
     ],
 )
 def test_FFT_1dsignal(par):
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     """Dot-test and inversion for FFT operator for 1d signal"""
     decimal = 3 if np.real(np.ones(1, par["dtype"])).dtype == np.float32 else 8
@@ -1135,6 +1158,8 @@ def test_FFT_2dsignal(par):
     """Dot-test and inversion for fft operator for 2d signal
     (fft on single dimension)
     """
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     decimal = 3 if np.real(np.ones(1, par["dtype"])).dtype == np.float32 else 8
 
@@ -1350,6 +1375,8 @@ def test_FFT_3dsignal(par):
     """Dot-test and inversion for fft operator for 3d signal
     (fft on single dimension)
     """
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     decimal = 3 if np.real(np.ones(1, par["dtype"])).dtype == np.float32 else 8
 
@@ -1576,6 +1603,8 @@ def test_FFT_3dsignal(par):
 )
 def test_FFT2D(par):
     """Dot-test and inversion for FFT2D operator for 2d signal"""
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     decimal = 3 if np.real(np.ones(1, par["dtype"])).dtype == np.float32 else 8
 
@@ -1711,6 +1740,8 @@ def test_FFT2D(par):
 )
 def test_FFT3D(par):
     """Dot-test and inversion for FFTND operator for 3d signal"""
+    if par["engine"] == "mkl_fft" and sys.platform == "darwin":
+        pytest.skip("mkl_fft not supported on macOS")
     np.random.seed(5)
     decimal = 3 if np.real(np.ones(1, par["dtype"])).dtype == np.float32 else 8
 

requirements-dev.txt

@@ -1,3 +1,6 @@
+--index-url https://software.repos.intel.com/python/pypi
+--extra-index-url https://pypi.org/simple
+mkl_fft; sys_platform != "darwin"
 numpy>=2.0.0
 scipy>=1.13.0
 jax
@@ -30,4 +33,3 @@ black
 flake8
 mypy
 pytensor>=2.28.0
-mkl-fft; sys_platform != "darwin"

requirements-doc.txt

@@ -1,3 +1,6 @@
+--index-url https://software.repos.intel.com/python/pypi
+--extra-index-url https://pypi.org/simple
+mkl_fft; sys_platform != "darwin"
 numpy>=2.0.0
 scipy>=1.13.0
 jax
@@ -31,4 +34,3 @@ flake8
 mypy
 pytensor>=2.28.0
 pymc>=5.21.0
-mkl-fft; sys_platform != "darwin"