summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSeth R. Johnson <johnsonsr@ornl.gov>2022-01-27 23:08:15 -0500
committerGitHub <noreply@github.com>2022-01-27 21:08:15 -0700
commit2fd26be9889847b9bc75fde160e263e3b98448c3 (patch)
tree8ce3e882d40b6ac8957e4888059950fea2f4e859 /var
parent405adce5aee7577373c0d31d0905afbe10e98c3f (diff)
downloadspack-2fd26be9889847b9bc75fde160e263e3b98448c3.tar.gz
spack-2fd26be9889847b9bc75fde160e263e3b98448c3.tar.bz2
spack-2fd26be9889847b9bc75fde160e263e3b98448c3.tar.xz
spack-2fd26be9889847b9bc75fde160e263e3b98448c3.zip
Trilinos: minimize E4S CUDA build (#28591)
* trilinos: update dependencies Use the tribits deps to clarify some dependencies, and group some together using `with` statements, eliminating some transitive conflict duplication. * trilinos: Restricit cuda incompatibility * e4s: vastly reduce number of packages in trilinos-cuda build Not clear who the customers of cuda-enabled trilinos are, or what options they need, or which sets of options conflict... * e4s: remove ~wrapper from trilinos+cuda
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py47
1 files changed, 22 insertions, 25 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 88c6714fc5..a130447979 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -174,7 +174,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# ###################### Conflicts ##########################
- # Epetra packages
+ # Epetra stack
with when('~epetra'):
conflicts('+amesos')
conflicts('+aztec')
@@ -188,8 +188,11 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
conflicts('+epetraextbtf')
conflicts('+epetraextexperimental')
conflicts('+epetraextgraphreorderings')
+ with when('+teko'):
+ conflicts('~stratimikos')
+ conflicts('@:12 gotype=long')
- # Tpetra packages
+ # Tpetra stack
with when('~kokkos'):
conflicts('+cuda')
conflicts('+rocm')
@@ -204,31 +207,29 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
conflicts('+teko')
conflicts('+zoltan2')
- with when('+teko'):
- conflicts('~amesos')
- conflicts('~anasazi')
- conflicts('~aztec')
- conflicts('~ifpack')
- conflicts('~ml')
- conflicts('~stratimikos')
- conflicts('@:12 gotype=long')
+ with when('~zoltan'):
+ conflicts('+isorropia')
+ conflicts('+scorec')
+ conflicts('+shylu')
+ conflicts('+zoltan2')
+ with when('~shards'):
+ conflicts('+intrepid')
+ conflicts('+intrepid2')
+ conflicts('+scorec')
+ conflicts('+stk')
+ with when('+scorec'):
+ conflicts('~mpi')
+ conflicts('~stk')
# Known requirements from tribits dependencies
conflicts('+aztec', when='~fortran')
conflicts('+basker', when='~amesos2')
- conflicts('+minitensor', when='~boost')
conflicts('+ifpack2', when='~belos')
conflicts('+intrepid', when='~sacado')
- conflicts('+intrepid', when='~shards')
- conflicts('+intrepid2', when='~shards')
- conflicts('+isorropia', when='~zoltan')
+ conflicts('+minitensor', when='~boost')
conflicts('+phalanx', when='~sacado')
- conflicts('+scorec', when='~mpi')
- conflicts('+scorec', when='~shards')
- conflicts('+scorec', when='~stk')
- conflicts('+scorec', when='~zoltan')
+ conflicts('+stokhos', when='~kokkos')
conflicts('+tempus', when='~nox')
- conflicts('+zoltan2', when='~zoltan')
# Only allow DTK with Trilinos 12.14, 12.18
conflicts('+dtk', when='~boost')
@@ -279,12 +280,8 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# Old trilinos fails with new CUDA (see #27180)
conflicts('@:13.0.1 +cuda', when='^cuda@11:')
-
- # See discussion on the PR adding cuda@11.6 for details.
- #
- # https://github.com/spack/spack/pull/28439
- #
- conflicts('+cuda', when='^cuda@11.6.0:')
+ # Build hangs with CUDA 11.6 (see #28439)
+ conflicts('+cuda +stokhos', when='^cuda@11.6:')
# stokhos fails on xl/xl_r
conflicts('+stokhos', when='%xl')