diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2021-11-22 13:54:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-22 07:54:19 -0500 |
commit | 5eba5dc271101df658f8dd132015cb90687d8a3d (patch) | |
tree | 514bc36b88a186be6b8c95cf573902a883756eb8 /var | |
parent | 5f10562ad13c803bf5d22552a9f07c8c379fdd23 (diff) | |
download | spack-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 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/cp2k/package.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index d1ac5b086e..42958771ff 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -53,14 +53,15 @@ class Cp2k(MakefilePackage, CudaPackage): ' and BQB compression')) variant('spglib', default=False, description='Enable support for spglib') - variant('cuda_arch_35_k20x', default=False, - description=('CP2K (resp. DBCSR) has specific parameter sets for' - ' different GPU models. Enable this when building' - ' with cuda_arch=35 for a K20x instead of a K40')) - variant('cuda_fft', default=False, - description=('Use CUDA also for FFTs in the PW part of CP2K')) - variant('cuda_blas', default=False, - description=('Use CUBLAS for general matrix operations in DBCSR')) + with when('+cuda'): + variant('cuda_arch_35_k20x', default=False, + description=('CP2K (resp. DBCSR) has specific parameter sets for' + ' different GPU models. Enable this when building' + ' with cuda_arch=35 for a K20x instead of a K40')) + variant('cuda_fft', default=False, + description=('Use CUDA also for FFTs in the PW part of CP2K')) + variant('cuda_blas', default=False, + description=('Use CUBLAS for general matrix operations in DBCSR')) HFX_LMAX_RANGE = range(4, 8) @@ -167,8 +168,6 @@ class Cp2k(MakefilePackage, CudaPackage): depends_on('python@3.6:', when='@7:+cuda', type='build') depends_on('spglib', when='+spglib') - conflicts('~cuda', '+cuda_fft') - conflicts('~cuda', '+cuda_blas') # Apparently cp2k@4.1 needs an "experimental" version of libwannier.a # which is only available contacting the developer directly. See INSTALL |