summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2020-08-31 20:42:21 -0700
committerGitHub <noreply@github.com>2020-09-01 05:42:21 +0200
commit28ef5c0e276ae00ce3b99040a30be3ca9d083de1 (patch)
treea858b744c58f53ce2934cfe73b7d1b1257fa0422 /var
parent7926f84022e4f22bcaa120dd444dee096223f743 (diff)
downloadspack-28ef5c0e276ae00ce3b99040a30be3ca9d083de1.tar.gz
spack-28ef5c0e276ae00ce3b99040a30be3ca9d083de1.tar.bz2
spack-28ef5c0e276ae00ce3b99040a30be3ca9d083de1.tar.xz
spack-28ef5c0e276ae00ce3b99040a30be3ca9d083de1.zip
dihydrogen, hydrogen: dependency on CUB is conditional on CUDA version (#18427)
In CUDA 11, CUB is integrated into the CUDA library.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/dihydrogen/package.py2
-rw-r--r--var/spack/repos/builtin/packages/hydrogen/package.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py
index 92d19950a2..eea22245ec 100644
--- a/var/spack/repos/builtin/packages/dihydrogen/package.py
+++ b/var/spack/repos/builtin/packages/dihydrogen/package.py
@@ -67,7 +67,7 @@ class Dihydrogen(CMakePackage, CudaPackage):
depends_on('cuda', when=('+cuda' or '+legacy'))
depends_on('cudnn', when=('+cuda' or '+legacy'))
- depends_on('cub', when=('+cuda' or '+legacy'))
+ depends_on('cub', when='^cuda@:10.99')
# Note that #1712 forces us to enumerate the different blas variants
depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas')
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index 8d0bc9398d..2618574803 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -99,7 +99,7 @@ class Hydrogen(CMakePackage, CudaPackage):
depends_on('mpfr', when='+mpfr')
depends_on('cuda', when='+cuda')
- depends_on('cub', when='+cuda')
+ depends_on('cub', when='^cuda@:10.99')
depends_on('half', when='+half')
conflicts('@0:0.98', msg="Hydrogen did not exist before v0.99. " +