summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/aluminum/package.py4
-rw-r--r--var/spack/repos/builtin/packages/dihydrogen/package.py2
-rw-r--r--var/spack/repos/builtin/packages/hydrogen/package.py4
-rw-r--r--var/spack/repos/builtin/packages/lbann/package.py5
4 files changed, 8 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py
index f23b186e73..9ebf13e282 100644
--- a/var/spack/repos/builtin/packages/aluminum/package.py
+++ b/var/spack/repos/builtin/packages/aluminum/package.py
@@ -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')
diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py
index 03e01cbd51..b9d8764d38 100644
--- a/var/spack/repos/builtin/packages/dihydrogen/package.py
+++ b/var/spack/repos/builtin/packages/dihydrogen/package.py
@@ -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')
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index 6fc5323ed5..3ffba8b812 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -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')
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index 2e377efbbd..c4d40d4be0 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -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')