ref: remove mentioned of cupy and scipy FFTFilters

RI-imaging · Dec 5, 2024 · 33c14b8 · 33c14b8
1 parent 528a038
commit 33c14b8
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 517 deletions.
diff --git a/docs/sec_code_reference.rst b/docs/sec_code_reference.rst
@@ -36,20 +36,6 @@ PyFFTW
    :members:
    :inherited-members:
 
-.. _sec_code_fourier_scipy:
-Scipy
-------
-.. automodule:: qpretrieve.fourier.ff_scipy
-   :members:
-   :inherited-members:
-
-.. _sec_code_fourier_cupy:
-Cupy
-----
-.. automodule:: qpretrieve.fourier.ff_cupy
-   :members:
-   :inherited-members:
-
 
 .. _sec_code_ifer:
 

diff --git a/docs/sec_examples.rst b/docs/sec_examples.rst
@@ -12,7 +12,3 @@ Examples
 .. fancy_include:: filter_visualization.py
 
 .. fancy_include:: fourier_scale.py
-
-.. fancy_include:: fft_options.py
-
-.. fancy_include:: fft_cupy3d_speed.py
diff --git a/examples/fft_cupy3d_speed.png b/examples/fft_cupy3d_speed.png
diff --git a/examples/fft_cupy3d_speed.py b/examples/fft_cupy3d_speed.py
diff --git a/examples/fft_options.png b/examples/fft_options.png
diff --git a/examples/fft_options.py b/examples/fft_options.py
diff --git a/qpretrieve/fourier/__init__.py b/qpretrieve/fourier/__init__.py
@@ -2,23 +2,12 @@
 import warnings
 
 from .ff_numpy import FFTFilterNumpy
-from .ff_scipy import FFTFilterScipy
 
 try:
     from .ff_pyfftw import FFTFilterPyFFTW
 except ImportError:
     FFTFilterPyFFTW = None
 
-try:
-    from .ff_cupy import FFTFilterCupy
-except ImportError:
-    FFTFilterCupy = None
-
-try:
-    from .ff_cupy3D import FFTFilterCupy3D
-except ImportError:
-    FFTFilterCupy3D = None
-
 PREFERRED_INTERFACE = None
 
 
@@ -27,9 +16,6 @@ def get_available_interfaces():
     interfaces = [
         FFTFilterPyFFTW,
         FFTFilterNumpy,
-        FFTFilterScipy,
-        FFTFilterCupy,
-        FFTFilterCupy3D,
     ]
     interfaces_available = []
     for interface in interfaces:

diff --git a/qpretrieve/fourier/ff_cupy.py b/qpretrieve/fourier/ff_cupy.py
diff --git a/qpretrieve/fourier/ff_cupy3D.py b/qpretrieve/fourier/ff_cupy3D.py
diff --git a/qpretrieve/fourier/ff_scipy.py b/qpretrieve/fourier/ff_scipy.py
diff --git a/setup.py b/setup.py
@@ -29,9 +29,6 @@
     ],
     extras_require={
         "FFTW": "pyfftw>=0.12.0",
-        # manually install 'cupy-cuda11x' if you have older CUDA.
-        # See https://cupy.dev/
-        "CUPY": "cupy-cuda12x",
     },
     python_requires='>=3.10, <4',
     keywords=["digital holographic microscopy",

diff --git a/tests/test_cupy_gpu/test_fourier_cupy.py b/tests/test_cupy_gpu/test_fourier_cupy.py