Always set cmake args because defaults change across versions (#21146)

This commit is contained in:
Harmen Stoppels 2021-01-19 16:57:12 +01:00 committed by GitHub
parent 8a6e7c8687
commit 034debeba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -56,17 +56,18 @@ class Spfft(CMakePackage, CudaPackage):
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
args = [] args = [
if spec.satisfies('+openmp'): self.define_from_variant('SPFFT_OMP', 'openmp'),
args += ["-DSPFFT_OMP=On"] self.define_from_variant('SPFFT_MPI', 'mpi'),
if spec.satisfies('+mpi'): self.define_from_variant('SPFFT_SINGLE_PRECISION', 'single_precision'),
args += ["-DSPFFT_MPI=On"] self.define_from_variant('SPFFT_GPU_DIRECT', 'gpu_direct'),
if spec.satisfies('+single_precision'): self.define_from_variant('SPFFT_FORTAN', 'fortran'),
args += ["-DSPFFT_SINGLE_PRECISION=On"] self.define_from_variant('SPFFT_STATIC', 'static')
if spec.satisfies('+gpu_direct'): ]
args += ["-DSPFFT_GPU_DIRECT=On"]
if spec.satisfies('+cuda'): if spec.satisfies('+cuda'):
args += ["-DSPFFT_GPU_BACKEND=CUDA"] args += ["-DSPFFT_GPU_BACKEND=CUDA"]
if spec.satisfies('+rocm'): if spec.satisfies('+rocm'):
archs = ",".join(self.spec.variants['amdgpu_target'].value) archs = ",".join(self.spec.variants['amdgpu_target'].value)
args += [ args += [
@ -75,10 +76,6 @@ def cmake_args(self):
'-DHIP_HCC_FLAGS=--amdgpu-target={0}'.format(archs), '-DHIP_HCC_FLAGS=--amdgpu-target={0}'.format(archs),
'-DHIP_CXX_COMPILER={0}'.format(self.spec['hip'].hipcc) '-DHIP_CXX_COMPILER={0}'.format(self.spec['hip'].hipcc)
] ]
if spec.satisfies('+fortran'):
args += ["-DSPFFT_FORTAN=On"]
if spec.satisfies('+static'):
args += ["-DSPFFT_STATIC=On"]
if 'fftw' in spec: if 'fftw' in spec:
args += ["-DSPFFT_FFTW_LIB=FFTW"] args += ["-DSPFFT_FFTW_LIB=FFTW"]