summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2023-12-21 12:50:35 +0100
committerGitHub <noreply@github.com>2023-12-21 12:50:35 +0100
commite7f897f959431dd0356f74fd3adf01cdd32376cc (patch)
tree6eab14e656b93f3fb64a5b2af92ee08a70a13b8b
parent1aaab97a162f2c3c6d1dca77e2ac3d75ab3e2930 (diff)
downloadspack-e7f897f959431dd0356f74fd3adf01cdd32376cc.tar.gz
spack-e7f897f959431dd0356f74fd3adf01cdd32376cc.tar.bz2
spack-e7f897f959431dd0356f74fd3adf01cdd32376cc.tar.xz
spack-e7f897f959431dd0356f74fd3adf01cdd32376cc.zip
ci: use "strong preference" idiom for compilers (#41806)
to avoid duplication of conflicts / requirements in config
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml3
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml4
2 files changed, 5 insertions, 2 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
index 413fdf34eb..c96ddafc08 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
@@ -10,7 +10,8 @@ spack:
packages:
all:
- require: '%cce'
+ require:
+ - any_of: ["%cce", "@:"] # cce as a strong preference; not all packages support it
compiler: [cce]
providers:
blas: [cray-libsci]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
index 2e10267f36..85e23abac4 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
@@ -7,7 +7,9 @@ spack:
packages:
all:
- require: '%oneapi target=x86_64_v3'
+ require:
+ - any_of: ["%oneapi", "@:"] # oneapi as a strong preference; not all packages support it
+ - "target=x86_64_v3"
providers:
blas: [openblas]
mpi: [mpich]