diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/aluminum/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hydrogen/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index a11b02932e..cafb0595d9 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -29,8 +29,6 @@ class Aluminum(CMakePackage): depends_on('cmake@3.9.0:', type='build') depends_on('cuda', when='+gpu') - depends_on('cudnn', when='+gpu') - depends_on('cub', when='+gpu') depends_on('mpi') depends_on('nccl', when='+nccl') depends_on('hwloc') diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 2c808120a4..2fc476ffc5 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -73,8 +73,8 @@ class Hydrogen(CMakePackage): depends_on('essl threads=openmp +ilp64', when='blas=essl +openmp_blas +int64_blas') depends_on('netlib-lapack +external-blas', when='blas=essl') - depends_on('aluminum@master', when='+al ~cuda') - depends_on('aluminum@master +gpu +mpi_cuda', when='+al +cuda') + depends_on('aluminum', when='+al ~cuda') + depends_on('aluminum +gpu +mpi_cuda', when='+al +cuda') # Note that this forces us to use OpenBLAS until #1712 is fixed depends_on('lapack', when='blas=openblas ~openmp_blas') @@ -87,7 +87,6 @@ class Hydrogen(CMakePackage): depends_on('mpfr', when='+mpfr') depends_on('cuda', when='+cuda') - depends_on('cudnn', when='+cuda') depends_on('cub', when='+cuda') conflicts('@0:0.98', msg="Hydrogen did not exist before v0.99. " + diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 28b7a81d67..48784b3637 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -68,9 +68,9 @@ class Lbann(CMakePackage): depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', when='build_type=Debug @0.91:0.94') - depends_on('aluminum@master', when='@:0.90,0.95: +al ~gpu') - depends_on('aluminum@master +gpu +mpi_cuda', when='@:0.90,0.95: +al +gpu ~nccl') - depends_on('aluminum@master +gpu +nccl +mpi_cuda', when='@:0.90,0.95: +al +gpu +nccl') + depends_on('aluminum', when='@:0.90,0.95: +al ~gpu') + depends_on('aluminum +gpu +mpi_cuda', when='@:0.90,0.95: +al +gpu ~nccl') + depends_on('aluminum +gpu +nccl +mpi_cuda', when='@:0.90,0.95: +al +gpu +nccl') depends_on('cuda', when='+gpu') depends_on('cudnn', when='+gpu') |