Skip to content

Commit 3cb43cc

Browse files
bmhan12rrsettgast
andauthored
refactor: Consolidate shared package versions for spack.yaml files (#309)
* Update uberenv hash with version and default changes * Change include path, add missing dependencies for spack bootstrap now * Fix shared hypre version * update lc build scripts to change queue --------- Co-authored-by: Randolph Settgast <settgast1@llnl.gov>
1 parent 9687680 commit 3cb43cc

26 files changed

+150
-441
lines changed

docker/Stanford/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN yum install -y \
2323
# xz \
2424
unzip \
2525
bzip2 \
26+
gnupg \
2627
&& pip3 install virtualenv
2728

2829
# Set locale to bypass ascii codec decode error

docker/TotalEnergies/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN yum install --disablerepo=intel-mkl-repo -y \
2222
# xz \
2323
unzip \
2424
bzip2 \
25+
gnupg2 \
2526
&& pip3 install virtualenv
2627

2728
# Install clingo for Spack

docker/TotalEnergies/Pangea3.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN dnf clean all && \
1919
gettext-devel \
2020
libtool \
2121
bzip2 \
22+
gnupg2 \
2223
unzip
2324

2425
# All the environment variables defined in this Dockerfile

docker/TotalEnergies/pecan.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN yum install -y \
3434
gcc-c++ \
3535
wget \
3636
bzip2 \
37+
gnupg \
3738
zlib-devel
3839

3940
WORKDIR /tmp/src

docker/pangea-spack.yaml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spack:
1212
# Regular TPLs do not need views
1313
view: false
1414

15+
# Include shared variants and versions
16+
include:
17+
- ../defaults.yaml
18+
- ../versions.yaml
19+
1520
compilers::
1621
- compiler:
1722
spec: gcc@=9.4.0
@@ -38,44 +43,6 @@ spack:
3843
lapack: [openblas]
3944
mpi: [openmpi]
4045

41-
42-
# v0.6.2
43-
blt:
44-
require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
45-
46-
hypre:
47-
require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
48-
49-
# v2025.0.3.0
50-
chai:
51-
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
52-
53-
# v2025.0.3.0
54-
umpire:
55-
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
56-
57-
# v2025.0.3.0
58-
raja:
59-
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
60-
61-
# v2025.0.3.0
62-
camp:
63-
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
64-
65-
# v2.12.0
66-
caliper:
67-
require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
68-
69-
# v0.9.2
70-
conduit:
71-
require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
72-
73-
uncrustify:
74-
require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
75-
76-
superlu-dist:
77-
require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
78-
7946
autoconf:
8047
externals:
8148
- spec: autoconf@2.69

docker/pecan-spack.yaml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spack:
1212
# Regular TPLs do not need views
1313
view: false
1414

15+
# Include shared variants and versions
16+
include:
17+
- ../defaults.yaml
18+
- ../versions.yaml
19+
1520
compilers::
1621
# Pecan CPU/GPU compiler
1722
- compiler:
@@ -38,44 +43,6 @@ spack:
3843
lapack: [intel-mkl]
3944
mpi: [openmpi]
4045

41-
42-
# v0.6.2
43-
blt:
44-
require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
45-
46-
hypre:
47-
require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
48-
49-
# v2025.0.3.0
50-
chai:
51-
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
52-
53-
# v2025.0.3.0
54-
umpire:
55-
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
56-
57-
# v2025.0.3.0
58-
raja:
59-
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
60-
61-
# v2025.0.3.0
62-
camp:
63-
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
64-
65-
# v2.12.0
66-
caliper:
67-
require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
68-
69-
# v0.9.2
70-
conduit:
71-
require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
72-
73-
uncrustify:
74-
require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
75-
76-
superlu-dist:
77-
require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
78-
7946
autoconf:
8047
version: [2.71]
8148
buildable: false

docker/rocky-spack.yaml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spack:
1212
# Regular TPLs do not need views
1313
view: false
1414

15+
# Include shared variants and versions
16+
include:
17+
- ../defaults.yaml
18+
- ../versions.yaml
19+
1520
compilers::
1621
- compiler:
1722
extra_rpaths: []
@@ -51,44 +56,6 @@ spack:
5156
lapack: [netlib-lapack]
5257
mpi: [openmpi]
5358

54-
55-
# v0.6.2
56-
blt:
57-
require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
58-
59-
hypre:
60-
require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
61-
62-
# v2025.0.3.0
63-
chai:
64-
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
65-
66-
# v2025.0.3.0
67-
umpire:
68-
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
69-
70-
# v2025.0.3.0
71-
raja:
72-
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
73-
74-
# v2025.0.3.0
75-
camp:
76-
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
77-
78-
# v2.12.0
79-
caliper:
80-
require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
81-
82-
# v0.9.2
83-
conduit:
84-
require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
85-
86-
uncrustify:
87-
require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
88-
89-
superlu-dist:
90-
require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
91-
9259
autoconf:
9360
version: [2.71]
9461
buildable: false

docker/spack.yaml

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ spack:
1212
# Regular TPLs do not need views
1313
view: false
1414

15+
# Include shared variants and versions
16+
include:
17+
- ../defaults.yaml
18+
- ../versions.yaml
19+
20+
1521
compilers::
1622
- compiler:
1723
extra_rpaths: []
@@ -117,44 +123,6 @@ spack:
117123
lapack: [netlib-lapack]
118124
mpi: [openmpi]
119125

120-
121-
# v0.6.2
122-
blt:
123-
require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
124-
125-
hypre:
126-
require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
127-
128-
# v2025.0.3.0
129-
chai:
130-
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
131-
132-
# v2025.0.3.0
133-
umpire:
134-
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
135-
136-
# v2025.0.3.0
137-
raja:
138-
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
139-
140-
# v2025.0.3.0
141-
camp:
142-
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
143-
144-
# v2.12.0
145-
caliper:
146-
require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
147-
148-
# v0.9.2
149-
conduit:
150-
require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
151-
152-
uncrustify:
153-
require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
154-
155-
superlu-dist:
156-
require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
157-
158126
autoconf:
159127
version: [2.71]
160128
buildable: false

docker/stanford-spack.yaml

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ spack:
1313
# Regular TPLs do not need views
1414
view: false
1515

16+
# Include shared variants and versions
17+
include:
18+
- ../defaults.yaml
19+
- ../versions.yaml
20+
1621
compilers::
1722
# Sherlock CPU/GPU Compiler (centos7 x86_64)
1823
- compiler:
@@ -39,43 +44,6 @@ spack:
3944
blas: [openblas]
4045
lapack: [openblas]
4146

42-
# v0.6.2
43-
blt:
44-
require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
45-
46-
hypre:
47-
require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
48-
49-
# v2025.0.3.0
50-
chai:
51-
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
52-
53-
# v2025.0.3.0
54-
umpire:
55-
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
56-
57-
# v2025.0.3.0
58-
raja:
59-
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
60-
61-
# v2025.0.3.0
62-
camp:
63-
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
64-
65-
# v2.12.0
66-
caliper:
67-
require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
68-
69-
# v0.9.2
70-
conduit:
71-
require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
72-
73-
uncrustify:
74-
require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
75-
76-
superlu-dist:
77-
require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
78-
7947
autoconf:
8048
buildable: false
8149
externals:

docker/tpl-centos-gcc-cuda.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ RUN yum -y install \
4848
# xz \
4949
unzip \
5050
bzip2 \
51+
gnupg \
5152
&& pip3 install virtualenv
5253

5354
# Install clingo for Spack

0 commit comments

Comments
 (0)