From 5af3c829ce9ba7fd4b9eff3c377ac2caa8e42cd4 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 28 Jan 2026 21:28:31 +0100 Subject: [PATCH 1/3] tutorial: try to use a new feature Signed-off-by: Massimiliano Culpo --- stacks/tutorial/spack.yaml | 92 +++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 36 deletions(-) diff --git a/stacks/tutorial/spack.yaml b/stacks/tutorial/spack.yaml index f1663375616..53167dce4f5 100644 --- a/stacks/tutorial/spack.yaml +++ b/stacks/tutorial/spack.yaml @@ -3,52 +3,71 @@ spack: include: - ../../.ci/gitlab/ + packages: all: - require: target=x86_64_v3 + require: + - target=x86_64_v3 tbb: require: intel-tbb - definitions: - - gcc_system_packages: - - matrix: - - - zlib-ng - - zlib-ng@2.0.7 - - zlib-ng@2.0.7 cflags=-O3 - - tcl - - tcl ^zlib-ng@2.0.7 cflags=-O3 - - hdf5 - - hdf5~mpi - - hdf5+hl+mpi ^mpich - - trilinos - - trilinos +hdf5 ^hdf5+hl+mpi ^mpich - - gcc@12.3 ~binutils # todo: enable ~binutils once unify: true is used - - mpileaks - - lmod@8.7.18 - - environment-modules - - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran - - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp - - vim - - ['%gcc@11'] - - gcc_old_packages: - - zlib-ng%gcc@10 - - clang_packages: - - matrix: - - [zlib-ng, tcl ^zlib-ng@2.0.7] - - ['%clang@14'] - - gcc_spack_built_packages: + + specs: + - group: compiler + specs: + - gcc@12 ~binutils + + - group: "gcc@11 specs" + specs: + - zlib-ng@2.2.4 + - zlib-ng@2.0.7 + - zlib-ng@2.0.7 cflags=-O3 + - tcl ^zlib-ng@2.2.4 + - tcl ^zlib-ng@2.0.7 cflags=-O3 + - hdf5+mpi^openmpi + - hdf5~mpi + - hdf5+hl+mpi ^mpich + - trilinos ^openmpi + - trilinos +hdf5 ^hdf5+hl+mpi ^mpich + - mpileaks + - lmod@8.7.18 + - environment-modules + - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran + - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp + - vim + override: + packages: + c: + prefer: [gcc@11] + cxx: + prefer: [gcc@11] + fortran: + prefer: [gcc@11] + + - group: scalapacks + needs: [compiler] + specs: - matrix: - [netlib-scalapack] - [^mpich, ^openmpi] - [^openblas, ^netlib-lapack] - - ['%gcc@12'] - matrix: - [py-scipy ^openblas, armadillo ^openblas, netlib-lapack, openmpi, mpich, elpa ^mpich] - - ['%gcc@12'] - specs: - - $gcc_system_packages - - $gcc_old_packages - - $clang_packages - - $gcc_spack_built_packages + override: + packages: + c: + prefer: [gcc@12] + cxx: + prefer: [gcc@12] + fortran: + prefer: [gcc@12] + # Miscellaneous specs use the default group + - zlib-ng@2.2.4%gcc@10 + - matrix: + - [ zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7 ] + - [ '%clang@14' ] + + concretizer: + unify: false ci: pipeline-gen: @@ -56,5 +75,6 @@ spack: image: name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30 entrypoint: [''] + cdash: build-group: Spack Tutorial From 404d1547818286049cbe16286fe531d3cfd5f996 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 26 Feb 2026 08:55:35 +0100 Subject: [PATCH 2/3] Bump Spack commit This one introduces environment groups, which are necessary for the changes in the stack. Signed-off-by: Massimiliano Culpo --- .ci/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/env b/.ci/env index 9c6460447c3..2ed870f0d5c 100644 --- a/.ci/env +++ b/.ci/env @@ -1,2 +1,2 @@ -SPACK_CHECKOUT_VERSION=a429ffcb690fc2098657e6ed14e12ad6af48c928 +SPACK_CHECKOUT_VERSION=bdfad3cad492b31c285110b65f80c3c0bd33f3a0 SPACK_CHECKOUT_REPO=spack/spack From cdbac48a19d2ea95831f5304ac52d8567f836349 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 26 Feb 2026 17:58:50 +0100 Subject: [PATCH 3/3] fixup Signed-off-by: Massimiliano Culpo --- .ci/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/env b/.ci/env index 2ed870f0d5c..3b04ded95b5 100644 --- a/.ci/env +++ b/.ci/env @@ -1,2 +1,2 @@ -SPACK_CHECKOUT_VERSION=bdfad3cad492b31c285110b65f80c3c0bd33f3a0 +SPACK_CHECKOUT_VERSION=06f3ac473591a77e6a623838fc2b164b7c06023b SPACK_CHECKOUT_REPO=spack/spack