Merge branch 'topic/default/prepare_rc1' into 'branch/default'

Prepare 0.4.0rc1

See merge request fluiddyn/fluidfft!57

Author: paugier

plugins/fluidfft-mpi4pyfft/src/fluidfft_mpi4pyfft/mpi_with_mpi4pyfft.py

@@ -137,8 +137,6 @@ def get_seq_indices_first_X(self):
 
 
 if __name__ == "__main__":
-    # mpirun -np 2 python -m fluidfft.fft3d.mpi_with_mpi4pyfft
-
     offt = FFTclass(6, 14, 4)
     offt.print_summary_for_debug()
     offt.run_tests()

plugins/fluidfft-mpi4pyfft/src/fluidfft_mpi4pyfft/mpi_with_mpi4pyfft_slab.py

@@ -30,8 +30,6 @@ class FFT3DMPIWithMPI4PYFFTSlab(FFT3DMPIWithMPI4PYFFT):
 FFTclass = FFT3DMPIWithMPI4PYFFTSlab
 
 if __name__ == "__main__":
-    # mpirun -np 2 python -m fluidfft.fft3d.mpi_with_mpi4pyfft_slab
-
     offt = FFTclass(6, 14, 4)
     offt.print_summary_for_debug()
     offt.run_tests()

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = 'mesonpy'
 
 [project]
 name = "fluidfft"
-version = "0.4.0rc0"
+version = "0.4.0rc1"
 description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
 authors = [
     {name = "Pierre Augier", email = "[email protected]"},

src/fluidfft/fft2d/operators.py

@@ -17,7 +17,7 @@
 from fluiddyn.util import mpi
 from fluiddyn.util.compat import cached_property
 
-from fluidfft import create_fft_object
+from fluidfft import create_fft_object, import_fft_class
 from fluidfft.base import OperatorsBase
 
 
@@ -44,23 +44,25 @@ def _make_str_length(length):
 
 
 def get_simple_2d_seq_method():
+    """Get a simple 2d sequential method"""
     try:
         import pyfftw
 
-        fft = "fft2d.with_pyfftw"
     except ImportError:
-        fft = "fft2d.with_fftw2d"
-    return fft
+        return "fft2d.with_fftw2d"
+    else:
+        del pyfftw
+        return "fft2d.with_pyfftw"
 
 
 def get_simple_2d_mpi_method():
+    """Get a simple 2d parallel method"""
+    method = "fft2d.mpi_with_fftwmpi2d"
     try:
-        import fluidfft.fft2d.mpi_with_fftwmpi2d
-
-        fft = "fft2d.mpi_with_fftwmpi2d"
+        import_fft_class(method)
     except ImportError:
-        fft = "fft2d.mpi_with_fftw1d"
-    return fft
+        method = "fft2d.mpi_with_fftw1d"
+    return method
 
 
 @boost

src/fluidfft/fft3d/operators.py

@@ -14,7 +14,7 @@
 from transonic import boost, Array, Type
 from fluiddyn.util import mpi
 
-from fluidfft import create_fft_object
+from fluidfft import create_fft_object, import_fft_class
 from fluidfft.base import OperatorsBase
 from fluidfft.fft2d.operators import _make_str_length
 
@@ -105,23 +105,25 @@ def loop_spectra_kzkh(
 
 
 def get_simple_3d_seq_method():
+    """Get a simple 3d sequential method"""
     try:
         import pyfftw
 
-        fft = "fft3d.with_pyfftw"
     except ImportError:
-        fft = "fft3d.with_fftw3d"
-    return fft
+        return "fft3d.with_fftw3d"
+    else:
+        del pyfftw
+        return "fft3d.with_pyfftw"
 
 
 def get_simple_3d_mpi_method():
+    """Get a simple 3d parallel method"""
+    method = "fft3d.mpi_with_fftwmpi3d"
     try:
-        import fluidfft.fft3d.mpi_with_fftwmpi3d
-
-        fft = "fft3d.mpi_with_fftwmpi3d"
+        import_fft_class(method)
     except ImportError:
-        fft = "fft3d.mpi_with_fftw1d"
-    return fft
+        method = "fft3d.mpi_with_fftw1d"
+    return method
 
 
 @boost