summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorJean-Paul Pelteret <jppelteret@gmail.com>2020-01-31 19:55:23 +0100
committerPeter Scheibel <scheibel1@llnl.gov>2020-02-27 18:22:09 -0800
commit7fc908e0e1571af2bd59ad823905242ee44f12ae (patch)
treed2fa23729abbf7aa4ae9bbd3e8d521df30becbb4 /var
parentb88c66cb52bb0a439e8a1f3abd5c58047f10477f (diff)
downloadspack-7fc908e0e1571af2bd59ad823905242ee44f12ae.tar.gz
spack-7fc908e0e1571af2bd59ad823905242ee44f12ae.tar.bz2
spack-7fc908e0e1571af2bd59ad823905242ee44f12ae.tar.xz
spack-7fc908e0e1571af2bd59ad823905242ee44f12ae.zip
Update package: Trilinos + Mesquite
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 74e6b7f85e..e15d229657 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -185,6 +185,8 @@ class Trilinos(CMakePackage):
description='Enable DataTransferKit')
variant('fortrilinos', default=False,
description='Enable ForTrilinos')
+ variant('mesquite', default=False,
+ description='Enable Mesquite')
resource(name='dtk',
git='https://github.com/ornl-cees/DataTransferKit.git',
@@ -208,6 +210,21 @@ class Trilinos(CMakePackage):
tag='develop',
placement='packages/ForTrilinos',
when='+fortrilinos')
+ resource(name='mesquite',
+ url='https://github.com/trilinos/mesquite/archive/trilinos-release-12-12-1.tar.gz',
+ sha256='e0d09b0939dbd461822477449dca611417316e8e8d8268fd795debb068edcbb5',
+ placement='packages/mesquite',
+ when='+mesquite @12.12.1:12.16.99')
+ resource(name='mesquite',
+ git='https://github.com/trilinos/mesquite.git',
+ commit='20a679679b5cdf15bf573d66c5dc2b016e8b9ca1', # branch trilinos-release-12-12-1
+ placement='packages/mesquite',
+ when='+mesquite @12.18.1:12.18.99')
+ resource(name='mesquite',
+ git='https://github.com/trilinos/mesquite.git',
+ tag='develop',
+ placement='packages/mesquite',
+ when='+mesquite @develop')
conflicts('+amesos2', when='~teuchos')
conflicts('+amesos2', when='~tpetra')
@@ -266,6 +283,8 @@ class Trilinos(CMakePackage):
conflicts('+fortrilinos', when='~fortran')
conflicts('+fortrilinos', when='@:99')
conflicts('+fortrilinos', when='@master')
+ # Only allow Mesquite with Trilinos 12.12 and up, and develop
+ conflicts('+mesquite', when='@0:12.10.99,master')
# Can only use one type of SuperLU
conflicts('+superlu-dist', when='+superlu')
# For Trilinos v11 we need to force SuperLUDist=OFF, since only the
@@ -417,6 +436,8 @@ class Trilinos(CMakePackage):
'ON' if '+kokkos' in spec else 'OFF'),
'-DTrilinos_ENABLE_MiniTensor=%s' % (
'ON' if '+minitensor' in spec else 'OFF'),
+ '-DTrilinos_ENABLE_Mesquite:BOOL=%s' % (
+ 'ON' if '+mesquite' in spec else 'OFF'),
'-DTrilinos_ENABLE_ML:BOOL=%s' % (
'ON' if '+ml' in spec else 'OFF'),
'-DTrilinos_ENABLE_MueLu:BOOL=%s' % (