From d9804d31f90c6e183e298a00caa359fbc8173a62 Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Wed, 28 Apr 2021 03:49:14 -0700 Subject: sundials: fix cuda architectures typo and specify raja variants (#23293) --- var/spack/repos/builtin/packages/sundials/package.py | 8 +++++--- 1 file 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([ -- cgit v1.2.3-60-g2f50