zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add teuchos to Trilinos, update dealii to explicitly require certain packages (#4460)

Browse Source
This commit is contained in:
Denis Davydov 2017-06-09 14:10:54 +02:00 committed by Adam J. Stewart
parent 85fd8f0b31
commit 5c5fd4a7e3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -126,22 +126,21 @@ class Dealii(CMakePackage):
depends_on("slepc", when='+slepc+petsc+mpi') depends_on("slepc", when='+slepc+petsc+mpi')
depends_on("slepc@:3.6.3", when='@:8.4.1+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("slepc~arpack", when='+slepc+petsc+mpi+int64')
depends_on("trilinos", when='+trilinos+mpi~int64') depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos", when='+trilinos+mpi~int64')
depends_on("trilinos~hypre", 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 # check that the combination of variants makes sense
def variants_check(self): conflicts('+gsl', when='@:8.4.2')
for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc', conflicts('+python', when='@:8.4.2')
'+slepc', '+trilinos']: for p in ['+arpack', '+hdf5', '+netcdf', '+p4est', '+petsc',
if p in self.spec and '+mpi' not in self.spec: '+slepc', '+trilinos']:
raise RuntimeError('The ' + p + ' variant requires +mpi') conflicts(p, when='~mpi')
def build_type(self): def build_type(self):
# CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release # CMAKE_BUILD_TYPE should be DebugRelease | Debug | Release
return 'DebugRelease' return 'DebugRelease'
def cmake_args(self): def cmake_args(self):
self.variants_check()
spec = self.spec spec = self.spec
options = [] options = []
# release flags # release flags

4
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -111,6 +111,8 @@ class Trilinos(CMakePackage):
description='Compile with zlib') description='Compile with zlib')
variant('stk', default=False, variant('stk', default=False,
description='Compile with STK') description='Compile with STK')
variant('teuchos', default=True,
description='Compile with Teuchos')
variant('belos', default=True, variant('belos', default=True,
description='Compile with Belos') description='Compile with Belos')
variant('zoltan', default=True, variant('zoltan', default=True,
@ -287,6 +289,8 @@ def cmake_args(self):
'ON' if '+ifpack2' in spec else 'OFF'), 'ON' if '+ifpack2' in spec else 'OFF'),
'-DTrilinos_ENABLE_Gtest:BOOL=%s' % ( '-DTrilinos_ENABLE_Gtest:BOOL=%s' % (
'ON' if '+gtest' in spec else 'OFF'), 'ON' if '+gtest' in spec else 'OFF'),
'-DTrilinos_ENABLE_Teuchos:BOOL=%s' % (
'ON' if '+teuchos' in spec else 'OFF'),
]) ])
if '+xsdkflags' in spec: if '+xsdkflags' in spec: