From e7f897f959431dd0356f74fd3adf01cdd32376cc Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 21 Dec 2023 12:50:35 +0100 Subject: ci: use "strong preference" idiom for compilers (#41806) to avoid duplication of conflicts / requirements in config --- share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml | 3 ++- share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'share') 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] -- cgit v1.2.3-70-g09d2