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

Update lbann sw stack dependencies (#10579)

Browse Source 
* Added a package for the MDAnalysis toolkit.

* Updated LBANN, Hydrogen, and Aluminum to not require CUDA-aware MPI
even when using CUDA.  Fixed small bugs within both LBANN and Hydrogen
packages.  Added requirements for breathe and cereal to LBANN.

* Update use case for doc dependencies.

* Cleaning up some of the LBANN software stack dependencies.
This commit is contained in:
Brian Van Essen 2019-02-13 11:19:15 -08:00 committed by Todd Gamblin
parent 89727ba4e7
commit 406a242847
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/aluminum/package.py
View File

@ -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')

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

@ -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. " +

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

@ -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')