summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorCody Balos <balos1@llnl.gov>2021-04-28 03:49:14 -0700
committerGitHub <noreply@github.com>2021-04-28 06:49:14 -0400
commitd9804d31f90c6e183e298a00caa359fbc8173a62 (patch)
tree5bf3ba5dd5f05df7beb73177ae3663f1b095c8a1 /var
parente14baffbcfce7a0073f21ce6d4e7615bca51e1cb (diff)
downloadspack-d9804d31f90c6e183e298a00caa359fbc8173a62.tar.gz
spack-d9804d31f90c6e183e298a00caa359fbc8173a62.tar.bz2
spack-d9804d31f90c6e183e298a00caa359fbc8173a62.tar.xz
spack-d9804d31f90c6e183e298a00caa359fbc8173a62.zip
sundials: fix cuda architectures typo and specify raja variants (#23293)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/sundials/package.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py
index 95a7440c77..715824475a 100644
--- a/var/spack/repos/builtin/packages/sundials/package.py
+++ b/var/spack/repos/builtin/packages/sundials/package.py
@@ -166,7 +166,9 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
depends_on('mpi', when='+superlu-dist')
# 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
depends_on('lapack', when='+lapack')
@@ -272,7 +274,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
archs = spec.variants['cuda_arch'].value
if archs != 'none':
arch_str = ",".join(archs)
- args.append('CMAKE_CUDA_ARCHITECTURES=%s' % arch_str)
+ args.append('-DCMAKE_CUDA_ARCHITECTURES=%s' % arch_str)
else:
args.append('-DCUDA_ENABLE=OFF')
@@ -356,7 +358,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
if '+raja' in spec:
args.extend([
'-DRAJA_ENABLE=ON',
- '-DRAJA_DIR=%s' % spec['raja'].prefix.share.raja.cmake
+ '-DRAJA_DIR=%s' % spec['raja'].prefix
])
else:
args.extend([