summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorPaul Kuberry <pakuber@sandia.gov>2021-09-08 08:18:01 -0600
committerGitHub <noreply@github.com>2021-09-08 15:18:01 +0100
commitc2a6ccbea843435d942f68ce60eb4c921d980150 (patch)
tree881caddbc910ac2d4a0ec6a5c5b181d3eab82f67 /var
parentca94240dd424c1a7af0adc2ce33d2ba53cdba71d (diff)
downloadspack-c2a6ccbea843435d942f68ce60eb4c921d980150.tar.gz
spack-c2a6ccbea843435d942f68ce60eb4c921d980150.tar.bz2
spack-c2a6ccbea843435d942f68ce60eb4c921d980150.tar.xz
spack-c2a6ccbea843435d942f68ce60eb4c921d980150.zip
trilinos: Gather teko requirements in one place and add conflict for muelu (#25703)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 22321903ff..0b8e82d17e 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -180,11 +180,6 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+epetraextbtf')
conflicts('+epetraextexperimental')
conflicts('+epetraextgraphreorderings')
- conflicts('+teko', when='~amesos')
- conflicts('+teko', when='~anasazi')
- conflicts('+teko', when='~aztec')
- conflicts('+teko', when='~ifpack')
- conflicts('+teko', when='~ml')
# Tpetra packages
with when('~kokkos'):
@@ -199,15 +194,23 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+teko')
conflicts('+zoltan2')
+ with when('+teko'):
+ conflicts('~amesos')
+ conflicts('~anasazi')
+ conflicts('~aztec')
+ conflicts('~ifpack')
+ conflicts('~ml')
+ conflicts('~stratimikos')
+ conflicts('@:12 gotype=long')
+
conflicts('+basker', when='~amesos2')
conflicts('+ifpack2', when='~belos')
conflicts('+intrepid', when='~sacado')
conflicts('+intrepid', when='~shards')
conflicts('+intrepid2', when='~shards')
conflicts('+isorropia', when='~zoltan')
+ conflicts('+muelu', when='~tpetra')
conflicts('+phalanx', when='~sacado')
- conflicts('+teko', when='~stratimikos')
- conflicts('+teko', when='@:12 gotype=long')
conflicts('+tempus', when='~nox')
conflicts('+zoltan2', when='~zoltan')