summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2021-04-20 18:33:05 -0700
committerGitHub <noreply@github.com>2021-04-20 18:33:05 -0700
commit4ee3934fb35ee1c0c169e9fd2851b54192aedb11 (patch)
tree9709b139ce006e22abe4ab03b9dbaa4105b80429 /var
parent58a897be0ec6fbd783a9d6193aaaaac86f4e4e60 (diff)
downloadspack-4ee3934fb35ee1c0c169e9fd2851b54192aedb11.tar.gz
spack-4ee3934fb35ee1c0c169e9fd2851b54192aedb11.tar.bz2
spack-4ee3934fb35ee1c0c169e9fd2851b54192aedb11.tar.xz
spack-4ee3934fb35ee1c0c169e9fd2851b54192aedb11.zip
lbann: requirements of the new variants for the legacy versions (#23159)
Fixed the range of conduit for legacy versions of LBANN.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/lbann/package.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index ea30ae1e9c..548da7b22a 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -78,6 +78,11 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage):
conflicts('+cuda', when='+rocm', msg='CUDA and ROCm support are mutually exclusive')
conflicts('+extras', when='~pfe', msg='Python extras require the Python front end support')
+ conflicts('~vision', when='@0.91:0.101')
+ conflicts('~numpy', when='@0.91:0.101')
+ conflicts('~python', when='@0.91:0.101')
+ conflicts('~pfe', when='@0.91:0.101')
+
depends_on('cmake@3.17.0:', type='build')
# Specify the correct versions of Hydrogen
@@ -169,7 +174,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage):
depends_on('nccl', when='@0.94:0.98.2 +cuda')
depends_on('conduit@0.4.0: +hdf5~hdf5_compat', when='@0.94:0.99 +conduit')
- depends_on('conduit@0.4.0: +hdf5~hdf5_compat', when='@:0.90,0.99:')
+ depends_on('conduit@0.5.0:0.6.99 +hdf5~hdf5_compat', when='@0.100:0.101 +conduit')
+ depends_on('conduit@0.6.0: +hdf5~hdf5_compat', when='@:0.90,0.99:')
# LBANN can use Python in two modes 1) as part of an extensible framework
# and 2) to drive the front end model creation and launch