hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix/clarify some trilinos variants/dependencies (#17006)

Browse source 
- 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.
This commit is contained in:
Seth R. Johnson 2020-06-17 10:34:53 -04:00 committed by GitHub
parent eb5f1886b7
commit e90c229dab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/trilinos/package.py
View file

@ -288,6 +288,7 @@ class Trilinos(CMakePackage):
conflicts('+zoltan2', when='~xpetra') conflicts('+zoltan2', when='~xpetra')
conflicts('+zoltan2', when='~zoltan') conflicts('+zoltan2', when='~zoltan')
conflicts('+dtk', when='~boost')
conflicts('+dtk', when='~intrepid2') conflicts('+dtk', when='~intrepid2')
conflicts('+dtk', when='~kokkos') conflicts('+dtk', when='~kokkos')
conflicts('+dtk', when='~teuchos') conflicts('+dtk', when='~teuchos')
@ -330,9 +331,9 @@ class Trilinos(CMakePackage):
depends_on('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
depends_on('boost', when='+boost') depends_on('boost', when='+boost')
depends_on('boost', when='+dtk')
depends_on('matio', when='+matio')
depends_on('glm', when='+glm') depends_on('glm', when='+glm')
depends_on('hdf5+hl', when='+hdf5')
depends_on('matio', when='+matio')
depends_on('metis@5:', when='+metis') depends_on('metis@5:', when='+metis')
depends_on('suite-sparse', when='+suite-sparse') depends_on('suite-sparse', when='+suite-sparse')
depends_on('zlib', when="+zlib") depends_on('zlib', when="+zlib")
@ -364,14 +365,12 @@ class Trilinos(CMakePackage):
depends_on('hypre~internal-superlu~int64', when='+hypre') 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@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre')
depends_on('hypre@develop~internal-superlu', when='@develop+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('python', when='+python')
depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('swig', when='+python') depends_on('swig', when='+python')
# Dependencies/conflicts when MPI is disabled # 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('+parmetis', when='~mpi')
conflicts('+pnetcdf', when='~mpi') conflicts('+pnetcdf', when='~mpi')