summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2023-04-24 18:32:01 -0500
committerGitHub <noreply@github.com>2023-04-24 16:32:01 -0700
commit75bf6d665c7a7fe14cd6a0c8e4e3f72457556edb (patch)
treebe10971bb29aa7860455f464849c8d196e7c11b4
parentc76023d7accc53f40e49481179bdb26c8c18845a (diff)
downloadspack-75bf6d665c7a7fe14cd6a0c8e4e3f72457556edb.tar.gz
spack-75bf6d665c7a7fe14cd6a0c8e4e3f72457556edb.tar.bz2
spack-75bf6d665c7a7fe14cd6a0c8e4e3f72457556edb.tar.xz
spack-75bf6d665c7a7fe14cd6a0c8e4e3f72457556edb.zip
e4s ci: add xyce (#36841)
* e4s ci: add xyce * relax trilinos contraints for xyce * also relax trilinos constraint for e4s-power stack * allow trilinos~shylu for xyce
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml14
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml14
2 files changed, 20 insertions, 8 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
index 729f06ada0..a575d82a60 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
@@ -33,10 +33,15 @@ spack:
python:
version: [3.7.15]
trilinos:
- require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
- +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro
- +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos +teko +tempus
- +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+ require:
+ - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
+ +intrepid +intrepid2 +isorropia +kokkos +minitensor +nox +piro +phalanx
+ +rol +rythmos +sacado +stk +shards +stratimikos +tempus +tpetra
+ +trilinoscouplings +zoltan]
+ - one_of: [gotype=long_long, gotype=all]
+ - one_of: [~ml ~muelu ~zoltan2 ~teko, +ml +muelu +zoltan2 +teko]
+ - one_of: [+superlu-dist, ~superlu-dist]
+ - one_of: [+shylu, ~shylu]
xz:
variants: +pic
mesa:
@@ -139,6 +144,7 @@ spack:
- umpire
- upcxx
- wannier90
+ - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos~shylu
# CUDA
- amrex +cuda
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
index 5b92e0c409..8bca38b472 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
@@ -36,10 +36,15 @@ spack:
python:
version: [3.8.13]
trilinos:
- require: +amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext
- +ifpack +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
- +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stratimikos
- +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
+ require:
+ - one_of: [+amesos +amesos2 +anasazi +aztec +boost +epetra +epetraext +ifpack
+ +intrepid +intrepid2 +isorropia +kokkos +minitensor +nox +piro +phalanx
+ +rol +rythmos +sacado +stk +shards +stratimikos +tempus +tpetra
+ +trilinoscouplings +zoltan]
+ - one_of: [gotype=long_long, gotype=all]
+ - one_of: [~ml ~muelu ~zoltan2 ~teko, +ml +muelu +zoltan2 +teko]
+ - one_of: [+superlu-dist, ~superlu-dist]
+ - one_of: [+shylu, ~shylu]
xz:
variants: +pic
mesa:
@@ -147,6 +152,7 @@ spack:
- variorum
- veloc
- wannier90
+ - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos~shylu
# CUDA
- amrex +cuda