hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nfft, pnfft: fix detection of fftw variants (precision) (#30935)

Browse source 
* nfft, pnfft: fix detection of fftw variants (precision)

* nfft, pnfft: use fftw's selected_precisions; avoid repetitive calls to spec

Co-authored-by: Martin Lang <martin.lang@mpsd.mpg.de>
This commit is contained in:
Martin Lang 2022-06-09 17:47:12 +02:00 committed by GitHub
parent 01f8236bf5
commit 4a8db00691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
var/spack/repos/builtin/packages/nfft/package.py
View file

@ -19,51 +19,58 @@ class Nfft(AutotoolsPackage):
depends_on('fftw')
_fftw_precisions = None
@property
def fftw_selected_precisions(self):
if not self._fftw_precisions:
self._fftw_precisions = self.spec['fftw'].package.selected_precisions
return self._fftw_precisions
def configure(self, spec, prefix):
options = ['--prefix={0}'.format(prefix)]
configure = Executable('../configure')
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double', create=True):
configure(*options)
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float', create=True):
configure('--enable-float', *options)
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double', create=True):
configure('--enable-long-double', *options)
def build(self, spec, prefix):
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make()
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make()
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make()
def check(self):
spec = self.spec
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make("check")
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make("check")
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make("check")
def install(self, spec, prefix):
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make("install")
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make("install")
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make("install")

33
var/spack/repos/builtin/packages/pnfft/package.py
View file

@ -18,6 +18,14 @@ class Pnfft(AutotoolsPackage):
depends_on('pfft')
depends_on('gsl')
_fftw_precisions = None
@property
def fftw_selected_precisions(self):
if not self._fftw_precisions:
self._fftw_precisions = self.spec['fftw'].package.selected_precisions
return self._fftw_precisions
def configure(self, spec, prefix):
options = ['--prefix={0}'.format(prefix)]
if not self.compiler.f77 or not self.compiler.fc:
@ -25,46 +33,45 @@ def configure(self, spec, prefix):
configure = Executable('../configure')
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double', create=True):
configure(*options)
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float', create=True):
configure('--enable-float', *options)
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double', create=True):
configure('--enable-long-double', *options)
def build(self, spec, prefix):
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make()
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make()
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make()
def check(self):
spec = self.spec
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make("check")
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make("check")
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make("check")
def install(self, spec, prefix):
if '+double' in spec['fftw']:
if 'double' in self.fftw_selected_precisions:
with working_dir('double'):
make("install")
if '+float' in spec['fftw']:
if 'float' in self.fftw_selected_precisions:
with working_dir('float'):
make("install")
if '+long_double' in spec['fftw']:
if 'long_double' in self.fftw_selected_precisions:
with working_dir('long-double'):
make("install")