diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2020-06-17 10:34:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 09:34:53 -0500 |
| commit | e90c229dab42760f9fcf6f72267b35d054dbf606 (patch) | |
| tree | 6d9014c3b0267840e069c93e57ede7fdb3235426 | |
| parent | eb5f1886b78a2b79c9fb5748addaad69c1a56591 (diff) | |
| download | spack-e90c229dab42760f9fcf6f72267b35d054dbf606.tar.gz spack-e90c229dab42760f9fcf6f72267b35d054dbf606.tar.bz2 spack-e90c229dab42760f9fcf6f72267b35d054dbf606.tar.xz spack-e90c229dab42760f9fcf6f72267b35d054dbf606.zip | |
Fix/clarify some trilinos variants/dependencies (#17006)
- Parallel HDF5 isn't required -- the comment seems to be about a
transitive dependency with pnetcdf.
- Boost usage should respect the variant, not automatically be reenabled
when choosing DTK.
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 5e8a96a16a..16f916849c 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -288,6 +288,7 @@ class Trilinos(CMakePackage): conflicts('+zoltan2', when='~xpetra') conflicts('+zoltan2', when='~zoltan') + conflicts('+dtk', when='~boost') conflicts('+dtk', when='~intrepid2') conflicts('+dtk', when='~kokkos') conflicts('+dtk', when='~teuchos') @@ -330,9 +331,9 @@ class Trilinos(CMakePackage): depends_on('blas') depends_on('lapack') depends_on('boost', when='+boost') - depends_on('boost', when='+dtk') - depends_on('matio', when='+matio') depends_on('glm', when='+glm') + depends_on('hdf5+hl', when='+hdf5') + depends_on('matio', when='+matio') depends_on('metis@5:', when='+metis') depends_on('suite-sparse', when='+suite-sparse') depends_on('zlib', when="+zlib") @@ -364,14 +365,12 @@ class Trilinos(CMakePackage): depends_on('hypre~internal-superlu~int64', when='+hypre') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre') depends_on('hypre@develop~internal-superlu', when='@develop+hypre') - # We need hdf5+hl to match with netcdf during concretization - depends_on('hdf5+hl+mpi', when='+hdf5+mpi') depends_on('python', when='+python') depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('swig', when='+python') # Dependencies/conflicts when MPI is disabled - depends_on('hdf5+hl~mpi', when='+hdf5~mpi') + depends_on('hdf5~mpi', when='+hdf5~mpi') conflicts('+parmetis', when='~mpi') conflicts('+pnetcdf', when='~mpi') |