From 28ef5c0e276ae00ce3b99040a30be3ca9d083de1 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Mon, 31 Aug 2020 20:42:21 -0700 Subject: dihydrogen, hydrogen: dependency on CUB is conditional on CUDA version (#18427) In CUDA 11, CUB is integrated into the CUDA library. --- var/spack/repos/builtin/packages/dihydrogen/package.py | 2 +- var/spack/repos/builtin/packages/hydrogen/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'var') 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. " + -- cgit v1.2.3-70-g09d2