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

LBANN update HWLOC versions (#19683)

Browse Source 
* Updates in LBANN an Aluminum code now allow working with versions
HWLOC 1.11.x and 2.x and up.

* Updating the minimum CMake version to address a pending PR in LBANN
that will require C++17 support and needs CMake to properly separate
the compiler flags from nvcc.

* Clarified the support for different versions of HWLOC in LBANN
This commit is contained in:
Brian Van Essen 2020-11-05 14:28:27 -08:00 committed by GitHub
parent 8b96e10ecc
commit 16c8cdaef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,10 @@ class Aluminum(CMakePackage, CudaPackage):
variant('cuda_rma', default=False, description='Builds with support for CUDA intra-node '
' Put/Get and IPC RMA functionality')
depends_on('cmake@3.16.0:', type='build')
depends_on('cmake@3.17.0:', type='build')
depends_on('mpi')
depends_on('nccl', when='+nccl')
depends_on('hwloc@2.0:')
depends_on('hwloc@1.11:')
generator = 'Ninja'
depends_on('ninja', type='build')

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

@ -105,7 +105,7 @@ class Dihydrogen(CMakePackage, CudaPackage):
generator = 'Ninja'
depends_on('ninja', type='build')
depends_on('cmake@3.16.0:', type='build')
depends_on('cmake@3.17.0:', type='build')
depends_on('py-breathe', type='build', when='+docs')
depends_on('doxygen', type='build', when='+docs')

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

@ -63,9 +63,9 @@ class Hydrogen(CMakePackage, CudaPackage):
description='Use OpenMP taskloops instead of parallel for loops.')
variant('half', default=True,
description='Builds with support for FP16 precision data types')
depends_on('cmake@3.16.0:', type='build')
depends_on('cmake@3.17.0:', type='build')
depends_on('mpi')
depends_on('hwloc@2.0:')
depends_on('hwloc@1.11:')
# Note that #1712 forces us to enumerate the different blas variants
depends_on('openblas', when='blas=openblas ~openmp_blas ~int64_blas')

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

@ -60,7 +60,7 @@ class Lbann(CMakePackage, CudaPackage):
conflicts('@:0.90,0.99:', when='~conduit')
depends_on('cmake@3.16.0:', type='build')
depends_on('cmake@3.17.0:', type='build')
# Specify the correct versions of Hydrogen
depends_on('hydrogen@:1.3.4', when='@0.95:0.100')
@ -100,7 +100,8 @@ class Lbann(CMakePackage, CudaPackage):
depends_on('cudnn@8.0.2:', when='@:0.90,0.101: +cuda')
depends_on('cub', when='@0.94:0.98.2 +cuda')
depends_on('mpi')
depends_on('hwloc@2.0:')
depends_on('hwloc@1.11:', when='@:0.90,0.102:')
depends_on('hwloc@1.11:1.11.99', when='@0.95:0.101.99')
depends_on('half', when='+half')