diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-06-09 14:10:54 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-09 07:10:54 -0500 |
| commit | 5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e (patch) | |
| tree | 99bfd31eb58ea31fd097acd57d298ff6c5f94c01 | |
| parent | 85fd8f0b31b2df7ec610e13092b9e43aeca01d45 (diff) | |
| download | spack-5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e.tar.gz spack-5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e.tar.bz2 spack-5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e.tar.xz spack-5c5fd4a7e38aada4f0ca8d39394c457dbc1ecc5e.zip | |
add teuchos to Trilinos, update dealii to explicitly require certain packages (#4460)
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 5f149b74fe..0148fae7a2 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -126,22 +126,21 @@ class Dealii(CMakePackage): depends_on("slepc", when='+slepc+petsc+mpi') depends_on("slepc@:3.6.3", when='@:8.4.1+slepc+petsc+mpi') depends_on("slepc~arpack", when='+slepc+petsc+mpi+int64') - depends_on("trilinos", when='+trilinos+mpi~int64') - depends_on("trilinos~hypre", when="+trilinos+mpi+int64") + depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos", when='+trilinos+mpi~int64') + depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre", when="+trilinos+mpi+int64") # check that the combination of variants makes sense - def variants_check(self): - for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', - '+slepc', '+trilinos']: - if p in self.spec and '+mpi' not in self.spec: - raise RuntimeError('The ' + p + ' variant requires +mpi') + conflicts('+gsl', when='@:8.4.2') + conflicts('+python', when='@:8.4.2') + for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', + '+slepc', '+trilinos']: + conflicts(p, when='~mpi') def build_type(self): # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release return 'DebugRelease' def cmake_args(self): - self.variants_check() spec = self.spec options = [] # release flags diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 40929499de..f28eb36a50 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -111,6 +111,8 @@ class Trilinos(CMakePackage): description='Compile with zlib') variant('stk', default=False, description='Compile with STK') + variant('teuchos', default=True, + description='Compile with Teuchos') variant('belos', default=True, description='Compile with Belos') variant('zoltan', default=True, @@ -287,6 +289,8 @@ class Trilinos(CMakePackage): 'ON' if '+ifpack2' in spec else 'OFF'), '-DTrilinos_ENABLE_Gtest:BOOL=%s' % ( 'ON' if '+gtest' in spec else 'OFF'), + '-DTrilinos_ENABLE_Teuchos:BOOL=%s' % ( + 'ON' if '+teuchos' in spec else 'OFF'), ]) if '+xsdkflags' in spec: |