summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-11-22 13:54:19 +0100
committerGitHub <noreply@github.com>2021-11-22 07:54:19 -0500
commit5eba5dc271101df658f8dd132015cb90687d8a3d (patch)
tree514bc36b88a186be6b8c95cf573902a883756eb8 /lib
parent5f10562ad13c803bf5d22552a9f07c8c379fdd23 (diff)
downloadspack-5eba5dc271101df658f8dd132015cb90687d8a3d.tar.gz
spack-5eba5dc271101df658f8dd132015cb90687d8a3d.tar.bz2
spack-5eba5dc271101df658f8dd132015cb90687d8a3d.tar.xz
spack-5eba5dc271101df658f8dd132015cb90687d8a3d.zip
Make CUDA and ROCm architecture conditional (#27185)
* Make CUDA and ROCm architecture conditional fixes #14337 The variant to specify which architecture to use for CUDA and ROCm are now conditional on +cuda and +rocm respectively. * cp2k: make all CUDA related variants conditional on +cuda
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_systems/cuda.py3
-rw-r--r--lib/spack/spack/build_systems/rocm.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py
index 634cfad637..79f57b046e 100644
--- a/lib/spack/spack/build_systems/cuda.py
+++ b/lib/spack/spack/build_systems/cuda.py
@@ -35,7 +35,8 @@ class CudaPackage(PackageBase):
variant('cuda_arch',
description='CUDA architecture',
- values=spack.variant.any_combination_of(*cuda_arch_values))
+ values=spack.variant.any_combination_of(*cuda_arch_values),
+ when='+cuda')
# https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#nvcc-examples
# https://llvm.org/docs/CompileCudaWithLLVM.html#compiling-cuda-code
diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py
index 977db700db..828ebe7a67 100644
--- a/lib/spack/spack/build_systems/rocm.py
+++ b/lib/spack/spack/build_systems/rocm.py
@@ -100,7 +100,8 @@ class ROCmPackage(PackageBase):
# possible amd gpu targets for rocm builds
variant('amdgpu_target',
description='AMD GPU architecture',
- values=spack.variant.any_combination_of(*amdgpu_targets))
+ values=spack.variant.any_combination_of(*amdgpu_targets),
+ when='+rocm')
depends_on('llvm-amdgpu', when='+rocm')
depends_on('hsa-rocr-dev', when='+rocm')