diff options
| author | Tom Payerle <payerle@umd.edu> | 2020-04-14 12:14:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 11:14:20 -0500 |
| commit | e10c134745c35cc8ac85f2da1e48b60bfb0668d7 (patch) | |
| tree | 0049ac4a9f054077845b8af99d30eaa139afb0e8 | |
| parent | 71fb29fccf083f70254524f346cac7675ba60f48 (diff) | |
| download | spack-e10c134745c35cc8ac85f2da1e48b60bfb0668d7.tar.gz spack-e10c134745c35cc8ac85f2da1e48b60bfb0668d7.tar.bz2 spack-e10c134745c35cc8ac85f2da1e48b60bfb0668d7.tar.xz spack-e10c134745c35cc8ac85f2da1e48b60bfb0668d7.zip | |
pfft: fix to handle 'precision' variant in fftw (#16029)
* pfft: fix to handle 'precision' variant in fftw
pfft had been checking for +double, etc. in fftw spec, which no longer
are present (replaced by Multivalued variant precision).
* pfft: fix to handle 'precision' variant in fftw
pfft had been checking for +double, etc. in fftw spec, which no
longer are present (replaced by Multivalued variant precision).
(amended to use more idiomatic checks as suggested by @alalazo)
| -rw-r--r-- | var/spack/repos/builtin/packages/pfft/package.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/pfft/package.py b/var/spack/repos/builtin/packages/pfft/package.py index c682ee63ce..0dcbd0bb71 100644 --- a/var/spack/repos/builtin/packages/pfft/package.py +++ b/var/spack/repos/builtin/packages/pfft/package.py @@ -27,46 +27,50 @@ class Pfft(AutotoolsPackage): configure = Executable('../configure') - if '+double' in spec['fftw']: + fftw = spec['fftw'] + if 'precision=double' in fftw: with working_dir('double', create=True): configure(*options) - if '+float' in spec['fftw']: + if 'precision=float' in fftw: with working_dir('float', create=True): configure('--enable-float', *options) - if '+long_double' in spec['fftw']: + if 'precision=long_double' in fftw: with working_dir('long-double', create=True): configure('--enable-long-double', *options) def build(self, spec, prefix): - if '+double' in spec['fftw']: + fftw = spec['fftw'] + if 'precision=double' in fftw: with working_dir('double'): make() - if '+float' in spec['fftw']: + if 'precision=float' in fftw: with working_dir('float'): make() - if '+long_double' in spec['fftw']: + if 'precision=long_double' in fftw: with working_dir('long-double'): make() def check(self): spec = self.spec - if '+double' in spec['fftw']: + fftw = spec['fftw'] + if 'precision=double' in fftw: with working_dir('double'): make("check") - if '+float' in spec['fftw']: + if 'precision=float' in fftw: with working_dir('float'): make("check") - if '+long_double' in spec['fftw']: + if 'precision=long_double' in fftw: with working_dir('long-double'): make("check") def install(self, spec, prefix): - if '+double' in spec['fftw']: + fftw = spec['fftw'] + if 'precision=double' in fftw: with working_dir('double'): make("install") - if '+float' in spec['fftw']: + if 'precision=float' in fftw: with working_dir('float'): make("install") - if '+long_double' in spec['fftw']: + if 'precision=long_double' in fftw: with working_dir('long-double'): make("install") |