sundials: fix cuda architectures typo and specify raja variants (#23293)

This commit is contained in:
Cody Balos 2021-04-28 03:49:14 -07:00 committed by GitHub
parent e14baffbcf
commit d9804d31f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -167,6 +167,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
# Other parallelism dependencies # Other parallelism dependencies
depends_on('raja', when='+raja') depends_on('raja', when='+raja')
depends_on('raja+cuda', when='+raja +cuda')
depends_on('raja+rocm', when='+raja +rocm')
# External libraries # External libraries
depends_on('lapack', when='+lapack') depends_on('lapack', when='+lapack')
@ -272,7 +274,7 @@ def on_off(varstr):
archs = spec.variants['cuda_arch'].value archs = spec.variants['cuda_arch'].value
if archs != 'none': if archs != 'none':
arch_str = ",".join(archs) arch_str = ",".join(archs)
args.append('CMAKE_CUDA_ARCHITECTURES=%s' % arch_str) args.append('-DCMAKE_CUDA_ARCHITECTURES=%s' % arch_str)
else: else:
args.append('-DCUDA_ENABLE=OFF') args.append('-DCUDA_ENABLE=OFF')
@ -356,7 +358,7 @@ def on_off(varstr):
if '+raja' in spec: if '+raja' in spec:
args.extend([ args.extend([
'-DRAJA_ENABLE=ON', '-DRAJA_ENABLE=ON',
'-DRAJA_DIR=%s' % spec['raja'].prefix.share.raja.cmake '-DRAJA_DIR=%s' % spec['raja'].prefix
]) ])
else: else:
args.extend([ args.extend([