From 71c8375862e8d70c1dc6be74fb8e8abd835bf5fa Mon Sep 17 00:00:00 2001 From: Tim Moon Date: Thu, 27 Jan 2022 03:21:45 -0800 Subject: Update CMake to 3.21 in LBANN-related projects (#28507) * Update CMake to 3.21 in LBANN-related projects * Allow CMake 3.17 for older versions of LBANN, Hydrogen, Aluminum --- var/spack/repos/builtin/packages/aluminum/package.py | 3 ++- var/spack/repos/builtin/packages/hydrogen/package.py | 3 ++- var/spack/repos/builtin/packages/lbann/package.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index e9c7051432..3c912d0652 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -42,7 +42,8 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): ' Put/Get and IPC RMA functionality') variant('rccl', default=False, description='Builds with support for NCCL communication lib') - depends_on('cmake@3.17.0:', type='build') + depends_on('cmake@3.21.0:', type='build', when='@1.0.1:') + depends_on('cmake@3.17.0:', type='build', when='@:1.0.0') depends_on('mpi') depends_on('nccl@2.7.0-0:', when='+nccl') depends_on('hwloc@1.11:') diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index af99fa5b60..00b72ff97e 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -67,7 +67,8 @@ class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): conflicts('~openmp', when='+omp_taskloops') conflicts('+cuda', when='+rocm', msg='CUDA and ROCm support are mutually exclusive') - depends_on('cmake@3.17.0:', type='build') + depends_on('cmake@3.21.0:', type='build', when='@1.5.2:') + depends_on('cmake@3.17.0:', type='build', when='@:1.5.1') depends_on('mpi') depends_on('hwloc@1.11:') depends_on('hwloc +cuda +nvml', when='+cuda') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index fa0302a540..5ec1afa539 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -106,7 +106,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): conflicts('+gold', when='platform=darwin', msg="gold does not work on Darwin") conflicts('+lld', when='platform=darwin', msg="lld does not work on Darwin") - depends_on('cmake@3.17.0:', type='build') + depends_on('cmake@3.21.0:', type='build', when='@0.103:') + depends_on('cmake@3.17.0:', type='build', when='@:0.102') # Specify the correct versions of Hydrogen depends_on('hydrogen@:1.3.4', when='@0.95:0.100') -- cgit v1.2.3-70-g09d2