Skip to content

Commit 24e246f

Browse files
authored
Bump Spack to v1.1 (#501)
* Bump Spack to v1.1 * Limit zlib hash based on dependency for compiler mixed env * Skip incremental environment with failing concretization * Back off py-numpy entirely due to concretization failure * Update stack view path to reflect gcc@12 version * Disable part of Stacks due to name clashes. * Specify namespace for tutorial_mpileaks package * Apply Phil's develop modifications from #502
1 parent a6f26e2 commit 24e246f

102 files changed

Lines changed: 8286 additions & 7327 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.

container/Dockerfile

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

1919
# Download the buildcache
2020
RUN mkdir /mirror
21-
RUN rclone copy :s3:spack-binaries/v2025.07.0/tutorial /mirror
21+
RUN rclone copy :s3:spack-binaries/releases/v2025.11/tutorial /mirror
2222

2323
RUN chmod -R go+r /mirror
2424

outputs/basics.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ example basics/uninstall-zlib "spack uninstall -y zlib-ng %gcc@10"
8282

8383
example basics/find-lf-zlib "spack find -lf zlib-ng"
8484

85-
zlib_hash="$(spack find --format '{hash:3}' zlib-ng@2.0.7 %clang)"
85+
zlib_hash="$(spack find --format '{hash:3}' zlib-ng@2.0.7 %clang ^gmake%gcc@10.5)"
8686
example --expect-error basics/uninstall-needed "spack uninstall zlib-ng/$zlib_hash"
8787
example basics/uninstall-r-needed "spack uninstall -y -R zlib-ng/$zlib_hash"
8888

outputs/basics/clone.out

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
$ git clone --depth=2 --branch=releases/v1.0 https://github.com/spack/spack.git ~/spack
1+
$ git clone --depth=2 --branch=releases/v1.1 https://github.com/spack/spack.git ~/spack
22
Cloning into '/home/spack/spack'...
3-
remote: Enumerating objects: 2296, done.K
4-
remote: Counting objects: 100% (2296/2296), done.K
5-
remote: Compressing objects: 100% (1549/1549), done.K
6-
remote:nTotale2296 (delta2304),2reused 1307 (delta 234), pack-reused 0 (from 0)K
7-
Receiving objects: 100% (2296/2296), 5.30 MiB | 12.56 MiB/s, done.
8-
Resolving deltas: 100% (304/304), done.
3+
remote: Enumerating objects: 2340, done.K
4+
remote: Counting objects: 100% (2340/2340), done.K
5+
remote: Compressing objects: 100% (1583/1583), done.K
6+
remote:nTotale2340 (delta2312),3reused 1328 (delta 237), pack-reused 0 (from 0)K
7+
Receiving objects: 100% (2340/2340), 5.30 MiB | 18.45 MiB/s, done.
8+
Resolving deltas: 100% (312/312), done.
99
$ cd ~/spack
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ spack uninstall gcc@12
22
y
33
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
4-
fmxnit5 gcc@12.5.0
4+
fmnvqo4 gcc@12.3.0
55

6-
==> 1 packages will be uninstalled. Do you want to proceed? [y/N] ==> Successfully uninstalled gcc@12.5.0~binutils+bootstrap~graphite~mold~nvptx~piclibs~profiled~strip build_system=autotools build_type=RelWithDebInfo languages:='c,c++,fortran' arch=linux-ubuntu22.04-x86_64_v3/fmxnit5
6+
==> 1 packages will be uninstalled. Do you want to proceed? [y/N] ==> Successfully uninstalled gcc@12.3.0~binutils+bootstrap~graphite~mold~nvptx~piclibs~profiled~strip build_system=autotools build_type=RelWithDebInfo languages:='c,c++,fortran' platform=linux os=ubuntu22.04 target=x86_64_v3/fmnvqo4

outputs/basics/compilers-2.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ spack compilers
22
==> Available compilers
33
-- gcc ubuntu22.04-x86_64 ---------------------------------------
4-
[e] gcc@11.4.0 [e] gcc@10.5.0 [+] gcc@12.5.0
4+
[e] gcc@11.4.0 [e] gcc@10.5.0 [+] gcc@12.3.0
55

66
-- llvm ubuntu22.04-x86_64 --------------------------------------
77
[e] llvm@14.0.0

outputs/basics/find-d-tcl.out

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
$ spack find -d tcl
22
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
3-
tcl@8.6.12
3+
tcl@8.6.17
44
compiler-wrapper@1.0
55
glibc@2.35
66
gmake@4.4.1
7+
gcc@10.5.0
8+
gcc-runtime@10.5.0
79
llvm@14.0.0
810
zlib-ng@2.0.7
911

1012

1113
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
12-
tcl@8.6.12
14+
tcl@8.6.17
1315
compiler-wrapper@1.0
1416
gcc@11.4.0
1517
gcc-runtime@11.4.0
1618
glibc@2.35
1719
gmake@4.4.1
1820
zlib-ng@2.0.7
1921

20-
tcl@8.6.12
22+
tcl@8.6.17
2123
compiler-wrapper@1.0
2224
gcc@11.4.0
2325
gcc-runtime@11.4.0

outputs/basics/find-d-trilinos.out

Lines changed: 53 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
$ spack find -d trilinos
22
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx,fortran=gcc@11.4.0 ------
33
trilinos@16.1.0
4-
cmake@3.31.8
5-
curl@8.11.1
6-
nghttp2@1.65.0
7-
diffutils@3.10
8-
openssl@3.4.1
9-
ca-certificates-mozilla@2025-05-20
10-
ncurses@6.5
11-
zlib-ng@2.2.4
4+
cmake@3.31.9
5+
curl@8.15.0
6+
libssh2@1.11.1
7+
mbedtls@2.28.9
8+
nghttp2@1.48.0
9+
diffutils@3.12
10+
ncurses@6.5-20250705
11+
zlib-ng@2.0.7
1212
compiler-wrapper@1.0
1313
gcc@11.4.0
1414
gcc-runtime@11.4.0
1515
glibc@2.35
1616
gmake@4.4.1
17-
hwloc@2.11.1
17+
hwloc@2.12.2
1818
libpciaccess@0.17
1919
util-macros@1.20.1
2020
libxml2@2.13.5
2121
libiconv@1.18
2222
xz@5.6.3
23-
pkgconf@2.3.0
23+
pkgconf@2.5.1
2424
kokkos@4.5.01
2525
kokkos-kernels@4.5.01
26-
openblas@0.3.29
26+
openblas@0.3.30
2727
openmpi@5.0.8
2828
autoconf@2.72
2929
m4@1.4.20
3030
libsigsegv@2.14
3131
automake@1.16.5
3232
libevent@2.1.12
33+
openssl@3.6.0
34+
ca-certificates-mozilla@2025-08-12
3335
libtool@2.4.7
3436
findutils@4.10.0
3537
gettext@0.23.1
@@ -42,62 +44,75 @@ trilinos@16.1.0
4244
bison@3.8.2
4345
libedit@3.1-20240808
4446
libxcrypt@4.4.38
45-
perl@5.40.0
47+
perl@5.42.0
4648
berkeley-db@18.1.40
4749
bzip2@1.0.8
48-
gdbm@1.23
49-
readline@8.2
50-
pmix@5.0.5
50+
gdbm@1.25
51+
readline@8.3
52+
pmix@6.0.0
53+
prrte@4.0.0
54+
flex@2.6.3
5155

5256
trilinos@16.1.0
53-
cmake@3.31.8
54-
curl@8.11.1
55-
nghttp2@1.65.0
56-
diffutils@3.10
57-
openssl@3.4.1
58-
ca-certificates-mozilla@2025-05-20
59-
perl@5.40.0
60-
berkeley-db@18.1.40
61-
ncurses@6.5
57+
cmake@3.31.9
58+
curl@8.15.0
59+
nghttp2@1.48.0
60+
diffutils@3.12
61+
openssl@3.6.0
62+
ca-certificates-mozilla@2025-08-12
63+
perl@5.42.0
64+
berkeley-db@18.1.40
65+
bzip2@1.0.8
66+
gdbm@1.25
67+
ncurses@6.5-20250705
6268
zlib-ng@2.2.4
6369
compiler-wrapper@1.0
6470
gcc@11.4.0
6571
gcc-runtime@11.4.0
6672
glibc@2.35
6773
gmake@4.4.1
6874
hdf5@1.14.6
69-
pkgconf@2.3.0
70-
hwloc@2.11.1
75+
pkgconf@2.5.1
76+
hwloc@2.12.2
7177
libpciaccess@0.17
7278
util-macros@1.20.1
7379
libxml2@2.13.5
7480
libiconv@1.18
7581
xz@5.6.3
7682
kokkos@4.5.01
83+
cmake@3.31.9
84+
curl@8.15.0
85+
libssh2@1.11.1
86+
mbedtls@2.28.9
87+
openssl@3.6.0
88+
perl@5.42.0
89+
zlib-ng@2.0.7
7790
kokkos-kernels@4.5.01
78-
mpich@4.3.0
91+
mpich@4.3.2
7992
findutils@4.10.0
8093
gettext@0.23.1
81-
bzip2@1.0.8
94+
libxml2@2.13.5
8295
tar@1.35
8396
pigz@2.8
84-
zstd@1.5.7
85-
libfabric@2.2.0
86-
yaksa@0.3
97+
libfabric@2.3.1
98+
yaksa@0.4
8799
autoconf@2.72
88100
automake@1.16.5
89101
libtool@2.4.7
90102
m4@1.4.20
91103
libsigsegv@2.14
92-
python@3.13.5
93-
expat@2.7.1
104+
python@3.14.0
105+
expat@2.7.3
94106
libbsd@0.12.2
95107
libmd@1.1.0
96-
gdbm@1.23
97-
libffi@3.4.8
98-
readline@8.2
99-
sqlite@3.46.0
108+
gettext@0.23.1
109+
tar@1.35
110+
pigz@2.8
111+
libffi@3.5.2
112+
readline@8.3
113+
sqlite@3.50.4
100114
util-linux-uuid@2.41
101-
openblas@0.3.29
115+
zstd@1.5.7
116+
openblas@0.3.30
102117

103118
==> 2 installed packages

0 commit comments

Comments
 (0)