zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate cuda_arch downstream from LBANN, Hydrogen and DiHydrogen (#20345)

Browse Source
This commit is contained in:
Brian Van Essen 2020-12-14 01:14:49 -08:00 committed by GitHub
parent fc8c07df2f
commit b7aea9f3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/dihydrogen/package.py
View File

@ -75,6 +75,9 @@ class Dihydrogen(CMakePackage, CudaPackage):
# Add Aluminum variants # Add Aluminum variants
depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda') depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda')
for arch in CudaPackage.cuda_arch_values:
depends_on('aluminum cuda_arch=%s' % arch, when='+al +cuda cuda_arch=%s' % arch)
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@:10.99') depends_on('cub', when='^cuda@:10.99')

5
var/spack/repos/builtin/packages/hydrogen/package.py
View File

@ -53,8 +53,6 @@ class Hydrogen(CMakePackage, CudaPackage):
variant('mpfr', default=False, variant('mpfr', default=False,
description='Support GNU MPFR\'s' description='Support GNU MPFR\'s'
'arbitrary-precision floating-point arithmetic') 'arbitrary-precision floating-point arithmetic')
variant('cuda', default=False,
description='Builds with support for GPUs via CUDA and cuDNN')
variant('test', default=False, variant('test', default=False,
description='Builds test suite') description='Builds test suite')
variant('al', default=False, variant('al', default=False,
@ -96,6 +94,9 @@ class Hydrogen(CMakePackage, CudaPackage):
# Add Aluminum variants # Add Aluminum variants
depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda') depends_on('aluminum +cuda +nccl +ht +cuda_rma', when='+al +cuda')
for arch in CudaPackage.cuda_arch_values:
depends_on('aluminum cuda_arch=%s' % arch, when='+al +cuda cuda_arch=%s' % arch)
# Note that this forces us to use OpenBLAS until #1712 is fixed # Note that this forces us to use OpenBLAS until #1712 is fixed
depends_on('lapack', when='blas=openblas ~openmp_blas') depends_on('lapack', when='blas=openblas ~openmp_blas')

6
var/spack/repos/builtin/packages/lbann/package.py
View File

@ -101,6 +101,12 @@ class Lbann(CMakePackage, CudaPackage):
depends_on('dihydrogen@:0.0,0.2:', when='@:0.90,0.102: +dihydrogen') depends_on('dihydrogen@:0.0,0.2:', when='@:0.90,0.102: +dihydrogen')
conflicts('~dihydrogen', when='+distconv') conflicts('~dihydrogen', when='+distconv')
for arch in CudaPackage.cuda_arch_values:
depends_on('hydrogen cuda_arch=%s' % arch, when='cuda_arch=%s' % arch)
depends_on('aluminum cuda_arch=%s' % arch, when='+al +cuda cuda_arch=%s' % arch)
depends_on('dihydrogen cuda_arch=%s' % arch, when='+dihydrogen cuda_arch=%s' % arch)
depends_on('nccl cuda_arch=%s' % arch, when='+cuda cuda_arch=%s' % arch)
depends_on('cudnn', when='@0.90:0.100.99 +cuda') depends_on('cudnn', when='@0.90:0.100.99 +cuda')
depends_on('cudnn@8.0.2:', when='@:0.90,0.101: +cuda') depends_on('cudnn@8.0.2:', when='@:0.90,0.101: +cuda')
depends_on('cub', when='@0.94:0.98.2 +cuda ^cuda@:10.99') depends_on('cub', when='@0.94:0.98.2 +cuda ^cuda@:10.99')