Updating LBANN and related packages (#10305)
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.
This commit is contained in:
committed by
Peter Scheibel
parent
08c4b9d47a
commit
9102cd5790
@@ -73,14 +73,12 @@ class Hydrogen(CMakePackage):
|
||||
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 ~nccl')
|
||||
depends_on('aluminum@master +gpu +nccl +mpi_cuda', when='+al +cuda +nccl')
|
||||
depends_on('aluminum@master +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')
|
||||
|
||||
depends_on('mpi', when='~cuda')
|
||||
depends_on('mpi +cuda', when='+cuda')
|
||||
depends_on('mpi')
|
||||
|
||||
depends_on('scalapack', when='+scalapack')
|
||||
depends_on('gmp', when='+mpfr')
|
||||
@@ -154,7 +152,7 @@ def cmake_args(self):
|
||||
if '+al' in spec:
|
||||
args.extend([
|
||||
'-DHydrogen_ENABLE_ALUMINUM:BOOL=%s' % ('+al' in spec),
|
||||
'-DHYDROGEN_Aluminum_DIR={0}'.format(
|
||||
'-DALUMINUM_DIR={0}'.format(
|
||||
spec['aluminum'].prefix)])
|
||||
|
||||
return args
|
||||
|
||||
Reference in New Issue
Block a user