Skip to content

Commit 8d0701f

Browse files
becker33becker33
authored
tutorial stack: use when_possible and bootstrap gcc12 (new container) (#2277)
* tutorial stack: use when_possible and bootstrap gcc12 (uses new container) Signed-off-by: Gregory Becker <becker33@llnl.gov> * update generation container in addition to build container Signed-off-by: Gregory Becker <becker33@llnl.gov> * fix padding for multiple-appearing package names We add more padding for the package that is being built to better test package relocation. Change to key this package by name/hash instead of just name, for cases in which the package appears multiple times in the DAG (e.g. when bootstrapping one gcc with another). Signed-off-by: Gregory Becker <becker33@llnl.gov> * disable compiler mixing and lock down gcc runtimes Signed-off-by: Gregory Becker <becker33@llnl.gov> * Be more specific to avoid when_possible confusion Signed-off-by: Gregory Becker <becker33@llnl.gov> * update container to final hash post-merge Signed-off-by: Gregory Becker <becker33@llnl.gov> * update to use main ref for container image Signed-off-by: Gregory Becker <becker33@llnl.gov> --------- Signed-off-by: Gregory Becker <becker33@llnl.gov>
1 parent 33a490c commit 8d0701f

4 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎.ci/gitlab/.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ tools-sdk-build:
590590

591591
tutorial-generate:
592592
extends: [ ".tutorial", ".generate-x86_64"]
593-
image: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30
593+
image: ghcr.io/spack/tutorial-ubuntu-22.04:main
594594

595595
tutorial-build:
596596
extends: [ ".tutorial", ".build" ]

‎.ci/gitlab/configs/linux/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44
before_script-:
55
# Test package relocation on linux using a modified prefix
66
# This is not well supported on MacOS (https://github.com/spack/spack/issues/37162)
7-
- - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture.platform}-{architecture.target}/{name}-{version}-{hash}'"
7+
- - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}/${SPACK_JOB_SPEC_DAG_HASH}:'morepadding/{architecture.platform}-{architecture.target}/{name}-{version}-{hash}'"
88
- match_behavior: first
99
submapping:
1010
- match:

‎.ci/gitlab/configs/win64/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919

2020
script::
2121
- spack.ps1 env activate --without-view ${SPACK_CONCRETE_ENV_DIR}
22-
- spack.ps1 config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{hash}'"
22+
- spack.ps1 config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}/${SPACK_JOB_SPEC_DAG_HASH}:'morepadding/{hash}'"
2323
- mkdir ${SPACK_ARTIFACTS_ROOT}/user_data
2424
- spack.ps1 --backtrace ci rebuild | Tee-Object -FilePath "${env:SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt" 2>&1 | Tee-Object -FilePath "${env:SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt"
2525
image: "ghcr.io/johnwparent/windows-server21h2:sha-1c12b61"

‎stacks/tutorial/spack.yaml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,28 @@ spack:
55
- ../../.ci/gitlab/
66
packages:
77
all:
8-
require: target=x86_64_v3
8+
require:
9+
- target=x86_64_v3
10+
- spec: '%gcc-runtime@12'
11+
when: '%gcc@12'
12+
- spec: '%gcc-runtime@11'
13+
when: '%gcc@11'
14+
- spec: '%gcc-runtime@10'
15+
when: '%gcc@10'
916
tbb:
1017
require: intel-tbb
1118
definitions:
1219
- gcc_system_packages:
1320
- matrix:
14-
- - zlib-ng
21+
- - zlib-ng@2.2.4
1522
- zlib-ng@2.0.7
1623
- zlib-ng@2.0.7 cflags=-O3
17-
- tcl
24+
- tcl ^zlib-ng@2.2.4
1825
- tcl ^zlib-ng@2.0.7 cflags=-O3
19-
- hdf5
26+
- hdf5+mpi^openmpi
2027
- hdf5~mpi
2128
- hdf5+hl+mpi ^mpich
22-
- trilinos
29+
- trilinos ^openmpi
2330
- trilinos +hdf5 ^hdf5+hl+mpi ^mpich
2431
- gcc@12.3
2532
- mpileaks
@@ -30,10 +37,10 @@ spack:
3037
- vim
3138
- ['%gcc@11']
3239
- gcc_old_packages:
33-
- zlib-ng%gcc@10
40+
- zlib-ng@2.2.4%gcc@10
3441
- clang_packages:
3542
- matrix:
36-
- [zlib-ng, tcl ^zlib-ng@2.0.7]
43+
- [zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7]
3744
- ['%clang@14']
3845
- gcc_spack_built_packages:
3946
- matrix:
@@ -49,12 +56,15 @@ spack:
4956
- $gcc_old_packages
5057
- $clang_packages
5158
- $gcc_spack_built_packages
52-
59+
concretizer:
60+
# Hacky way to allow bootstrapping the compiler
61+
unify: when_possible
62+
compiler_mixing: false
5363
ci:
5464
pipeline-gen:
5565
- build-job:
5666
image:
57-
name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30
67+
name: ghcr.io/spack/tutorial-ubuntu-22.04:main
5868
entrypoint: ['']
5969
cdash:
6070
build-group: Spack Tutorial

0 commit comments

Comments
 (0)