Skip to content

Commit 38deb04

Browse files
alecbcsgithub-actions[bot]becker33psakievich
authored
SC24 (#404)
* Initial commit for SC24 * Switching to v0.23 release * Update container to use releases/ cache for pre-release testing * Update generated outputs on behalf of [@alecbcs] * Strictly order the sections of the tutorial for output generation * wip * remove duplicate clones * update gitmodules * remove failing concretization * fix environments.sh to get spack * update scripting section (#408) * Phil edits SC24 (#405) * Draft: Phil edits to developer * add optional section * Add some config stuff * Update config intro * Reduce table and reword * WIP configuration * Clean up configuration futher * clean up awkward sentence * Minor tweak * Defer discussion of defaults * Update tutorial_configuration.rst Co-authored-by: Greg Becker <becker33@llnl.gov> * Update developer section based on chat * Update tutorial_developer_workflows.rst Co-authored-by: Greg Becker <becker33@llnl.gov> * Update tutorial_developer_workflows.rst Co-authored-by: Greg Becker <becker33@llnl.gov> * Update tutorial_developer_workflows.rst Co-authored-by: Greg Becker <becker33@llnl.gov> * Update external from perl to curl * Update version for scr and remove version from macsio * Updates for developer extension section --------- Co-authored-by: Greg Becker <becker33@llnl.gov> * partial updates for outputs --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Gregory Becker <becker33@llnl.gov> Co-authored-by: psakievich <psakiev@sandia.gov>
1 parent 341bda8 commit 38deb04

136 files changed

Lines changed: 13634 additions & 16560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "_spack_root"]
22
path = _spack_root
33
url = https://github.com/spack/spack.git
4-
branch = releases/v0.22
4+
branch = releases/v0.23

‎common/setup.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
If you have not done the prior sections, you'll need to start the docker image::
44

5-
docker run -it ghcr.io/spack/tutorial:hpcic24
5+
docker run -it ghcr.io/spack/tutorial:sc24
66

77
and then set Spack up like this::
88

9-
git clone --depth=100 --branch=releases/v0.22 https://github.com/spack/spack
9+
git clone --depth=100 --branch=releases/v0.23 https://github.com/spack/spack
1010
. spack/share/spack/setup-env.sh
1111
spack tutorial -y
1212
spack bootstrap now

‎container/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get remove -y gcc-12
1717

1818
# Download the buildcache
1919
RUN mkdir /mirror
20-
RUN aws --region us-east-1 --no-sign-request s3 sync --only-show-errors s3://spack-binaries/v0.22.1/tutorial /mirror
20+
RUN aws --region us-east-1 --no-sign-request s3 sync --only-show-errors s3://spack-binaries/releases/v0.23/tutorial /mirror
2121

2222
RUN chmod -R go+r /mirror
2323

‎index.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ container image. You can invoke
5353

5454
.. code-block:: console
5555
56-
$ docker pull ghcr.io/spack/tutorial:hpcic24
57-
$ docker run -it ghcr.io/spack/tutorial:hpcic24
56+
$ docker pull ghcr.io/spack/tutorial:sc24
57+
$ docker run -it ghcr.io/spack/tutorial:sc24
5858
5959
to start using the container. You should now be ready to run through our demo scripts:
6060

@@ -93,7 +93,7 @@ Full contents:
9393
tutorial_stacks
9494
tutorial_developer_workflows
9595
tutorial_binary_cache
96-
tutorial_spack_scripting
96+
tutorial_scripting
9797

9898
.. toctree::
9999
:maxdepth: 3

‎outputs/Makefile‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,36 @@ sections := environments
2525
run_targets := $(addprefix run-,$(sections))
2626

2727
# Entrypoint
28-
update-outputs: run
28+
update-outputs: #run
2929
echo "Filtering raw outputs though col"
3030
for raw in raw/*/*.out; do \
3131
out=$$(echo $$raw | sed 's.raw/..'); \
3232
cat $$raw | perl -pe 's/\x1b]0;.+?\x07//g' | perl -pe 's/\x1b\[\d+F\x1b\[J//g' | perl -pe 's/\033\[([01];)?\d+m//g' | col -bp | sed '/^==> Waiting for/d' > $$out; \
3333
done
3434

35-
run: $(run_targets)
35+
run: run-scripting
3636

37-
$(addprefix local-run-,$(sections)):
38-
$(CURDIR)/$(@:local-run-%=%).sh
37+
run-scripting: run-cache scripting.sh
38+
run-cache: run-dev cache.sh
39+
run-dev: run-packaging dev.sh
40+
run-packaging: run-stacks packaging.sh
41+
run-stacks: run-environments stacks.sh
42+
run-environments: run-basics environments.sh
43+
run-basics: basics.sh init_spack.sh defs.sh
3944

40-
$(run_targets): run-%: %.sh init_spack.sh defs.sh
45+
local: local-scripting
46+
local-scripting: local-cache scripting.sh
47+
local-cache: local-dev cache.sh
48+
local-dev: local-packaging dev.sh
49+
local-packaging: local-stacks packaging.sh
50+
local-stacks: local-environments stacks.sh
51+
local-environments: local-basics environments.sh
52+
local-basics: basics.sh init_spack.sh defs.sh
53+
54+
local-%: %.sh init_spack.sh defs.sh
55+
$(CURDIR)/$(@:local-%=%).sh
56+
57+
run-%: %.sh init_spack.sh defs.sh
4158
$(DOCKER) run $(DOCKER_RUN_OPTS) --rm -t \
4259
--mount type=bind,source=$(CURDIR),target=/project \
4360
${container} \

‎outputs/basics/clone.out‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
1-
$ git clone --depth=100 --branch=releases/v0.22 https://github.com/spack/spack.git ~/spack
2-
Cloning into '/home/spack/spack'...
3-
remote: Enumerating objects: 21332, done.K
4-
remote: Counting objects: 100% (21332/21332), done.K
5-
remote: Compressing objects: 100% (11578/11578), done.K
6-
remote:nTotale21332 (delta12394),3reused016051i(delta.1860),/pack-reused 0K
7-
Receiving objects: 100% (21332/21332), 14.07 MiB | 22.27 MiB/s, done.
8-
Resolving deltas: 100% (2394/2394), done.
1+
$ git clone --depth=100 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
2+
fatal: destination path '/home/spack5/spack' already exists and is not an empty directory.
3+
4+
$ git clone --depth=100 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
5+
Cloning into '/home/spack5/spack'...
6+
remote: Enumerating objects: 21959, done.K
7+
remote: Counting objects: 100% (21959/21959), done.K
8+
remote: Compressing objects: 100% (11938/11938), done.K
9+
remote:nTotale21959 (delta12422),9reused114720i(delta.1849),/pack-reused 0 (from 0)K
10+
Receiving objects: 100% (21959/21959), 14.97 MiB | 23.47 MiB/s, done.
11+
Resolving deltas: 100% (2422/2422), done.
12+
$ cd ~/spack
13+
$ git clone --depth=100 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
14+
Cloning into '/home/spack5/spack'...
15+
remote: Enumerating objects: 21959, done.K
16+
remote: Counting objects: 100% (21959/21959), done.K
17+
remote: Compressing objects: 100% (11938/11938), done.K
18+
remote:nTotale21959 (delta12422),9reused114720i(delta.1849),/pack-reused 0 (from 0)K
19+
Receiving objects: 100% (21959/21959), 14.97 MiB | 23.61 MiB/s, done.
20+
Resolving deltas: 100% (2422/2422), done.
21+
$ cd ~/spack
22+
$ git clone --depth=2 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
23+
fatal: destination path '/home/spack5/spack' already exists and is not an empty directory.
24+
25+
$ git clone --depth=2 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
26+
Cloning into '/home/spack5/spack'...
27+
remote: Enumerating objects: 20970, done.K
28+
remote: Counting objects: 100% (20970/20970), done.K
29+
remote: Compressing objects: 100% (11467/11467), done.K
30+
remote:nTotale20970 (delta01785),9reused114006i(delta.1489),/pack-reused 0 (from 0)K
31+
Receiving objects: 100% (20970/20970), 14.78 MiB | 23.43 MiB/s, done.
32+
Resolving deltas: 100% (1785/1785), done.
33+
$ cd ~/spack
34+
$ git clone --depth=2 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
35+
Cloning into '/home/spack5/spack'...
36+
remote: Enumerating objects: 20970, done.K
37+
remote: Counting objects: 100% (20970/20970), done.K
38+
remote: Compressing objects: 100% (11452/11452), done.K
39+
Receiving objects: 100% (20970/20970), 14.78MMiB||119.78MMiB/s, done.
40+
remote: Total 20970 (delta 1797), reused 14162 (delta 1504), pack-reused 0 (from 0)K
41+
Resolving deltas: 100% (1797/1797), done.
942
$ cd ~/spack

‎outputs/basics/compiler-add-location.out‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
$ spack compiler add "$(spack location -i gcc@12)"
2-
==> Added 1 new compiler to /home/spack/.spack/linux/compilers.yaml
2+
==> Added 1 new compiler to /home/spack5/.spack/linux/compilers.yaml
33
gcc@12.3.0
44
==> Compilers are defined in the following files:
5-
/home/spack/.spack/linux/compilers.yaml
5+
/home/spack5/.spack/linux/compilers.yaml
6+
$ spack compiler add "$(spack location -i gcc@12)"
7+
==> Added 1 new compiler to /home/spack5/.spack/linux/compilers.yaml
8+
gcc@12.3.0
9+
==> Compilers are defined in the following files:
10+
/home/spack5/.spack/linux/compilers.yaml

‎outputs/basics/compiler-remove.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
$ spack compiler remove gcc@12
22
==> gcc@12.3.0 has been removed
3+
$ spack compiler remove gcc@12
4+
==> gcc@12.3.0 has been removed

‎outputs/basics/compilers.out‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ clang@14.0.0
55

66
-- gcc ubuntu22.04-x86_64 ---------------------------------------
77
gcc@11.4.0 gcc@10.5.0
8+
$ spack compilers
9+
==> Available compilers
10+
-- clang ubuntu22.04-x86_64 -------------------------------------
11+
clang@14.0.0
12+
13+
-- gcc ubuntu22.04-x86_64 ---------------------------------------
14+
gcc@11.4.0 gcc@10.5.0

‎outputs/basics/find-O3.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ $ spack find cflags=-O3
22
-- linux-ubuntu22.04-x86_64_v3 / gcc@11.4.0 ---------------------
33
zlib-ng@2.0.7
44
==> 1 installed package
5+
$ spack find cflags=-O3
6+
-- linux-ubuntu22.04-x86_64_v3 / gcc@11.4.0 ---------------------
7+
zlib-ng@2.0.7
8+
==> 1 installed package

0 commit comments

Comments
 (0)