dihydrogen, hydrogen: dependency on CUB is conditional on CUDA version (#18427)

In CUDA 11, CUB is integrated into the CUDA library.
This commit is contained in:
Brian Van Essen 2020-08-31 20:42:21 -07:00 committed by GitHub
parent 7926f84022
commit 28ef5c0e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -67,7 +67,7 @@ class Dihydrogen(CMakePackage, CudaPackage):
depends_on('cuda', when=('+cuda' or '+legacy')) depends_on('cuda', when=('+cuda' or '+legacy'))
depends_on('cudnn', 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 # Note that #1712 forces us to enumerate the different blas variants
depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas') depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas')

View File

@ -99,7 +99,7 @@ class Hydrogen(CMakePackage, CudaPackage):
depends_on('mpfr', when='+mpfr') depends_on('mpfr', when='+mpfr')
depends_on('cuda', when='+cuda') depends_on('cuda', when='+cuda')
depends_on('cub', when='+cuda') depends_on('cub', when='^cuda@:10.99')
depends_on('half', when='+half') depends_on('half', when='+half')
conflicts('@0:0.98', msg="Hydrogen did not exist before v0.99. " + conflicts('@0:0.98', msg="Hydrogen did not exist before v0.99. " +