Update pipeline configurations

Signed-off-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
2024-09-13 10:50:29 +02:00 · 2024-09-13 10:50:29 +02:00 · 41bb68a623
commit 41bb68a623
parent eaf4483db7
15 changed files with 195 additions and 236 deletions
--- a/lib/spack/docs/pipelines.rst
+++ b/lib/spack/docs/pipelines.rst
@ -330,7 +330,7 @@ that ``--tests`` is passed to ``spack ci rebuild`` as part of the
          - spack --version
          - cd ${SPACK_CONCRETE_ENV_DIR}
          - spack env activate --without-view .
-          - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
+          - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'"
           - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
           - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg; fi
           - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
--- a/share/spack/gitlab/cloud_pipelines/configs/config.yaml
+++ b/share/spack/gitlab/cloud_pipelines/configs/config.yaml
@ -6,5 +6,4 @@ config:
    root: /home/software/spack
    padded_length: 256
    projections:
-      all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'
-
+      all: "{architecture.platform}/{architecture.target}/{name}-{version}-{hash}"
--- a/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml
+++ b/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml
@ -4,7 +4,7 @@ ci:
      before_script-:
      # Test package relocation on linux using a modified prefix
      # This is not well supported on MacOS (https://github.com/spack/spack/issues/37162)
-      - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
+      - - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'"
  - match_behavior: first
    submapping:
    - match:
--- a/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml
+++ b/share/spack/gitlab/cloud_pipelines/configs/linux/ppc64le/ci.yaml
@ -15,7 +15,7 @@ ci:
      - cd ${SPACK_CONCRETE_ENV_DIR}
      - spack env activate --without-view .
      - if [ -n "$SPACK_BUILD_JOBS" ]; then spack config add "config:build_jobs:$SPACK_BUILD_JOBS"; fi
-      - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
+      - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}/{architecture.target}/{name}-{version}-{hash}'"
      - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
      - if [[ -r /mnt/key/e4s.gpg ]]; then spack gpg trust /mnt/key/e4s.gpg; fi
      - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml
@ -57,34 +57,22 @@ spack:

  - compiler_specs:
    - gcc@11.2
-    # Licensing OK?
-    # - intel-oneapi-compilers@2022.1
-    # - nvhpc

  - app_specs:
    - bwa
 # Depends on simde which requires newer compiler?
    #- bowtie2
-    # Requires x86_64 specific ASM
-    #- cistem
-    - cromwell
-    - fastqc
    - flux-sched
    - flux-core
    - flux-pmix
-    - gatk
    - gromacs
    - lammps
    - wrf build_type=dm+sm
    - mfem
    - mpas-model ^parallelio+pnetcdf
-    - nextflow
    - octave
    - openfoam
    - osu-micro-benchmarks
-    - parallel
-    # - paraview
-    - picard
    - quantum-espresso
    - raja
 # Depends on bowtie2 -> simde which requires newer compiler?
@ -94,12 +82,9 @@ spack:
    - salmon
    - samtools
    - seqtk
-    - snakemake
    - star
    # Requires gcc@9:
    #- ufs-weather-model
-# requires LLVM which fails without constraint
-    #- visit

  - lib_specs:
    - openmpi fabrics=ofi
@ -114,7 +99,6 @@ spack:
  - target:
    - target=aarch64

-
  specs:

  - matrix:
@ -130,7 +114,10 @@ spack:
  - matrix:
    - - $compiler_specs
    - - $compiler
-    - - $target
+
+  - matrix:
+    - [cromwell, fastqc, gatk, nextflow, parallel, picard, snakemake]
+    - [$target]

  ci:
    pipeline-gen:
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml
@ -2,6 +2,8 @@ spack:
  view: false
  packages:
    all:
+      require:
+      - target=x86_64_v3
      providers:
        blas:
        - openblas
@ -12,7 +14,8 @@ spack:
        - mpich
      variants: +mpi
    tbb:
-      require: intel-tbb
+      require:
+      - intel-tbb
    binutils:
      variants: +ld +gold +headers +libiberty ~nls
      version:
@ -43,8 +46,6 @@ spack:
      - '1.18'
    relion:
      variants: ~mklfft
-#    texlive:
-#      version: [20210325]
    trilinos:
      variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext
        +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu
@ -57,56 +58,35 @@ spack:

  - compiler_specs:
    - gcc@11.2
-    # Licensing OK?
-    # - intel-oneapi-compilers@2022.1
-    # - nvhpc

  - cuda_specs:
-# Disabled for consistency with aarch64
-    #- relion +cuda cuda_arch=70
    - raja +cuda cuda_arch=70
    - mfem +cuda cuda_arch=70

  - app_specs:
    - bwa
-# Disabled for consistency with aarch64
-    #- bowtie2
-# Disabled for consistency with aarch64
-    #- cistem
-    - cromwell
-    - fastqc
    - flux-sched
    - flux-core
    - flux-pmix
-    - gatk
    - gromacs
    - lammps
    - wrf build_type=dm+sm
    - mfem
    - mpas-model ^parallelio+pnetcdf
-    - nextflow
    - octave
    - openfoam
    - osu-micro-benchmarks
-    - parallel
-    # - paraview
-    - picard
    - quantum-espresso
 # Build broken for gcc@7.3.1 x86_64_v4 (error: '_mm512_loadu_epi32' was not declared in this scope)
    #- raja
-# Disabled for consistency with aarch64
-    #- rsem
    # Errors on texlive
    #- rstudio
    - salmon
    - samtools
    - seqtk
-    - snakemake
    - star
    # Requires gcc@9:
    #- ufs-weather-model
-# Disabled for consistency with aarch64
-    #- visit

  - lib_specs:
    - openmpi fabrics=ofi
@ -118,31 +98,32 @@ spack:
  - compiler:
    - '%gcc@7.3.1'

-  - target:
-    - target=x86_64_v3
-
-
  specs:

  - matrix:
    - - $cuda_specs
    - - $compiler
-    - - $target

  - matrix:
    - - $app_specs
    - - $compiler
-    - - $target

  - matrix:
    - - $lib_specs
    - - $compiler
-    - - $target

  - matrix:
    - - $compiler_specs
    - - $compiler
-    - - $target
+
+  - cromwell
+  - fastqc
+  - gatk
+  - parallel
+  - nextflow
+  - picard
+  - snakemake
+

  ci:
    pipeline-gen:
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
@ -32,24 +32,21 @@ spack:
          - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
  cdash:
    build-group: AWS Packages
+
  config:
    shared_linking:
      missing_library_policy: ignore  # due to use of externals
-  compilers:
-  - compiler:
-      environment: {}
-      extra_rpaths: []
-      flags: {}
-      modules: []
-      operating_system: amzn2
-      paths:
-        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gcc
-        cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/g++
-        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran
-        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran
-      spec: gcc@=12.4.0
-      target: aarch64
+
  packages:
+    gcc:
+      externals:
+      - spec: gcc@=12.4.0
+        prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b
+        extra_attributes:
+          compilers:
+            c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gcc
+            cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/g++
+            fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-aarch64/gcc-7.3.1/gcc-12.4.0-v6wxye6ijzrxnzxftcwnpu3psohsjl2b/bin/gfortran
    acfl:
      require:
      - '%gcc target=aarch64'
@ -73,7 +70,7 @@ spack:
      - mpich pmi=pmi2 device=ch4 netmod=ofi +slurm
    nvhpc:
      require:
-      - nvhpc %gcc target=aarch64
+      - "nvhpc target=aarch64"
    openfoam:
      require:
      - openfoam ^scotch@6.0.9
@ -85,7 +82,7 @@ spack:
    #   require:
    #     - one_of: ["palace cxxflags=\"-include cstdint\" ^fmt@9.1.0"]
    pmix:
-      require: 'pmix@3:'
+      require: "pmix@3:"
    quantum-espresso:
      require:
      - quantum-espresso@6.6 %gcc ^armpl-gcc
@ -95,7 +92,6 @@ spack:
      - prefix: /opt/slurm
        spec: slurm@22.05.8 +pmix
    all:
-      compiler: [gcc, arm, nvhpc, clang]
      providers:
        blas: [armpl-gcc, openblas]
        fftw-api: [armpl-gcc, fftw]
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
@ -36,38 +36,32 @@ spack:
          - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
  cdash:
    build-group: AWS Packages
+
  config:
    shared_linking:
      missing_library_policy: ignore  # due to use of externals
+
+  packages:
+    gcc:
+      externals:
+        - spec: gcc@=12.4.0
+          prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb
+          extra_attributes:
            compilers:
-  - compiler:
-      environment: {}
-      extra_rpaths: []
-      flags: {}
-      modules: []
-      operating_system: amzn2
-      paths:
-        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gcc
+              c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gcc
              cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/g++
-        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran
-        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran
-      spec: gcc@=12.4.0
-      target: x86_64
-  - compiler:
-      environment: {}
+              fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/bin/gfortran
+    intel-oneapi-compilers:
+      externals:
+        - spec: intel-oneapi-compilers@=2024.1.0
+          prefix: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop
+          extra_attributes:
+            compilers:
+              c: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icx
+              cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icpx
+              fortran: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx
            extra_rpaths:
              - /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-7.3.1/gcc-12.4.0-pttzchh7o54nhmycj4wgzw5mic6rk2nb/lib64
-      flags: {}
-      modules: []
-      operating_system: amzn2
-      paths:
-        cc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icx
-        cxx: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/icpx
-        f77: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx
-        fc: /home/software/spack/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeh/linux-amzn2-x86_64_v3/gcc-12.4.0/intel-oneapi-compilers-2024.1.0-f5u3psfhbwscasajkn324igtupn3blop/compiler/2024.1/bin/ifx
-      spec: oneapi@=2024.1.0
-      target: x86_64
-  packages:
    gettext:
      # Newer gettext cannot build with gcc@12 and old AL2 glibc headers
      # Older gettext versions do not build correctly with oneapi.
--- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
@ -2,9 +2,13 @@ spack:
  view: false
  packages:
    all:
-      require: target=x86_64_v3
-  definitions:
-    - default_specs:
+      require:
+      - target=x86_64_v3
+    c:
+      require:
+      - gcc
+
+  specs:
  - 'uncrustify build_system=autotools'
  - 'uncrustify build_system=cmake'
  - lz4  # MakefilePackage
@ -14,13 +18,6 @@ spack:
  - r-rcpp  # RPackage
  - ruby-rake  # RubyPackage
  - perl-data-dumper # PerlPackage
-    - arch:
-      - '%gcc'
-
-  specs:
-    - matrix:
-        - - $default_specs
-        - - $arch

  cdash:
    build-group: Build Systems
--- a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml
@ -1,17 +1,23 @@
 spack:
  view: false
+
  packages:
    all:
-      require: target=x86_64_v3
+      require:
+      - target=x86_64_v3
+      prefer:
+      - '%gcc'
+
  concretizer:
    unify: true
    reuse: false
-  definitions:
-  - default_specs:
+
+  specs:
    # editors
  - neovim~no_luajit
  - py-pynvim
-    - emacs+json+native+treesitter   # note, pulls in gcc
+  # FIXME (compiler as nodes): recover dependency on gcc as a library when +native
+  - emacs+json~native+treesitter   # note, pulls in gcc
    # - tree-sitter is a dep, should also have cli but no package
  - nano   # just in case
    # tags and scope search helpers
@ -68,14 +74,6 @@ spack:
  - doxygen
  - meson

-  - arch:
-    - '%gcc target=x86_64_v3'
-
-  specs:
-  - matrix:
-    - - $default_specs
-    - - $arch
-
  ci:
    pipeline-gen:
    - build-job:
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
@ -14,10 +14,15 @@ spack:

  packages:
    all:
-      require: "%cce@18.0.0 target=x86_64_v3"
-      compiler: [cce]
+      require:
+      - target=x86_64_v3
+      prefer:
+      - "%cce"
      providers:
        blas: [cray-libsci]
+        c: [cce]
+        cxx: [cce]
+        fortran: [cce]
        lapack: [cray-libsci]
        mpi: [cray-mpich]
        tbb: [intel-tbb]
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
@ -7,8 +7,9 @@ spack:

  packages:
    all:
-      require: "%gcc@9.4.0 target=ppc64le"
-      compiler: [gcc@9.4.0]
+      prefer:
+      - "%gcc@9.4.0"
+      - target=ppc64le
      providers:
        blas: [openblas]
        mpi: [mpich]
@ -31,19 +32,25 @@ spack:
    mpi:
      require: mpich
    mpich:
-      require: '~wrapperrpath ~hwloc %gcc@9.4.0 target=ppc64le'
+      require:
+      - '~wrapperrpath ~hwloc'
    ncurses:
-      require: '@6.3 +termlib %gcc@9.4.0 target=ppc64le'
+      require:
+      - '@6.3 +termlib'
    faodel:
-      require: "~tcmalloc %gcc@9.4.0 target=ppc64le"
+      require:
+      - "~tcmalloc"
    tbb:
      require: intel-tbb
    vtk-m:
-      require: "+examples %gcc@9.4.0 target=ppc64le"
+      require:
+      - "+examples"
    cuda:
-      require: "@11.4.4 %gcc@9.4.0 target=ppc64le"
+      require:
+      - "@11.4.4"
    paraview:
-      require: "+examples %gcc@9.4.0 target=ppc64le"
+      require:
+      - "+examples"


  specs:
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml
@ -7,7 +7,8 @@ spack:

  packages:
    all:
-      require: '%gcc target=x86_64_v3'
+      require:
+      - 'target=x86_64_v3'
      providers:
        blas: [openblas]
      variants: +mpi
@ -21,7 +22,9 @@ spack:
      variants: threads=openmp
    paraview:
      # Don't build GUI support or GLX rendering for HPC/container deployments
-      require: "@5.11 +examples ~qt ^[virtuals=gl] osmesa %gcc target=x86_64_v3"
+      require:
+      - "@5.11 +examples ~qt ^[virtuals=gl] osmesa"
+      - 'target=x86_64_v3'

    # ROCm
    comgr:
--- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
@ -2,17 +2,14 @@ spack:
  view: false
  packages:
    all:
-      require: target=x86_64_v3
+      require:
+      - target=x86_64_v3
+      - '%gcc@7.5.0'

      providers:
        mpi: [mvapich2]

-  definitions:
-    #- compilers: ['%gcc@8.3.1', '%clang@10.0.0']
-    - compilers: ['%gcc@7.5.0']
-
-    # Note skipping spot since no spack package for it
-    - radiuss:
+  specs:
  - ascent  # ^conduit@0.6.0
  - axom
  - blt
@ -21,7 +18,7 @@ spack:
  - chai  # ~examples
  - conduit  # ^hdf5+shared
  - flux-core
-      #- flux-sched
+  # - flux-sched
  - hypre
  - lbann
  - lvarray ~tests  # per Spack issue #23192  # ~examples
@ -36,14 +33,9 @@ spack:
  - scr
  - sundials
  - umpire # ~openmp
-      #- visit   # ^mesa-glu@9.0.0
+  # - visit   # ^mesa-glu@9.0.0
  - xbraid
  - zfp

-  specs:
-  - matrix:
-    - [$radiuss]
-    - [$compilers]
-
  cdash:
    build-group: RADIUSS
--- a/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/windows-vis/spack.yaml
@ -6,7 +6,7 @@
 spack:
  view: false
  specs:
-  - vtk~mpi
+  - vtk@9~mpi

  cdash:
    build-group: Windows Visualization (Kitware)