Commit 9d4cead3 authored by Theo Steininger's avatar Theo Steininger

Removed gfft.

parent fd6d03be
Pipeline #11495 passed with stages
in 30 minutes and 34 seconds
......@@ -24,6 +24,6 @@ import keepers
d2o_configuration = keepers.get_Configuration(
name='D2O',
file_name='D2O.conf',
search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
search_paths=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
......@@ -25,8 +25,6 @@ import keepers
# Setup the dependency injector
dependency_injector = keepers.DependencyInjector(
[('mpi4py.MPI', 'MPI'),
'gfft',
('nifty.dummys.gfft_dummy', 'gfft_dummy'),
'healpy',
'libsharp_wrapper_gl'])
......@@ -36,8 +34,9 @@ dependency_injector.register('pyfftw', lambda z: hasattr(z, 'FFTW_MPI'))
# Initialize the variables
variable_fft_module = keepers.Variable(
'fft_module',
['pyfftw', 'gfft', 'gfft_dummy'],
lambda z: z in dependency_injector)
['fftw', 'numpy'],
lambda z: (('pyfftw' in dependency_injector)
if z == 'fftw' else True))
def _healpy_validator(use_healpy):
......@@ -97,12 +96,11 @@ nifty_configuration = keepers.get_Configuration(
variable_default_field_dtype,
variable_default_distribution_strategy],
file_name='NIFTy.conf',
search_pathes=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
search_paths=[os.path.expanduser('~') + "/.config/nifty/",
os.path.expanduser('~') + "/.config/",
'./'])
########
########
try:
nifty_configuration.load()
......
......@@ -18,8 +18,7 @@
import numpy as np
from transformation import Transformation
from rg_transforms import FFTW, GFFT
from nifty.config import dependency_injector as gdi
from rg_transforms import FFTW, NUMPYFFT
from nifty import RGSpace, nifty_configuration
......@@ -29,26 +28,18 @@ class RGRGTransformation(Transformation):
module=module)
if module is None:
if nifty_configuration['fft_module'] == 'pyfftw':
if nifty_configuration['fft_module'] == 'fftw':
self._transform = FFTW(self.domain, self.codomain)
elif (nifty_configuration['fft_module'] == 'gfft' or
nifty_configuration['fft_module'] == 'gfft_dummy'):
self._transform = \
GFFT(self.domain,
self.codomain,
gdi.get(nifty_configuration['fft_module']))
elif nifty_configuration['fft_module'] == 'numpy':
self._transform = NUMPYFFT(self.domain, self.codomain)
else:
raise ValueError('ERROR: unknow default FFT module:' +
nifty_configuration['fft_module'])
else:
if module == 'pyfftw':
if module == 'fftw':
self._transform = FFTW(self.domain, self.codomain)
elif module == 'gfft':
self._transform = \
GFFT(self.domain, self.codomain, gdi.get('gfft'))
elif module == 'gfft_dummy':
self._transform = \
GFFT(self.domain, self.codomain, gdi.get('gfft_dummy'))
elif module == 'numpy':
self._transform = NUMPYFFT(self.domain, self.codomain)
else:
raise ValueError('ERROR: unknow FFT module:' + module)
......
......@@ -42,9 +42,9 @@ setup(name="ift_nifty",
]),
include_dirs=[numpy.get_include()],
dependency_links=[
'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers-0.3.5',
'git+https://gitlab.mpcdf.mpg.de/ift/d2o.git#egg=d2o-1.0.7'],
install_requires=['keepers>=0.3.5', 'd2o>=1.0.7'],
'git+https://gitlab.mpcdf.mpg.de/ift/keepers.git#egg=keepers-0.3.7',
'git+https://gitlab.mpcdf.mpg.de/ift/d2o.git#egg=d2o-1.0.8'],
install_requires=['keepers>=0.3.7', 'd2o>=1.0.8'],
package_data={'nifty.demos': ['demo_faraday_map.npy'],
},
license="GPLv3",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment