Skip to content

Commit 10adf8c

Browse files
remove lassen. add matrix and tuo (#320)
* remove lassen. add matrix * Add toss_4_x86_64_ib_cray spack config * Add rocm support to geos spack package * Update TPL scripts with tuolumne Co-authored-by: Victor A. P. Magri <paludettomag1@llnl.gov>
1 parent 3cb43cc commit 10adf8c

File tree

6 files changed

+507
-71
lines changed

6 files changed

+507
-71
lines changed

scripts/setupLC-TPL-helper.bash

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ MACHINE=$3
88
COMPILER=$4
99
GET_A_NODE=$5
1010

11-
if [[ ${MACHINE} == "ruby" ||\
12-
${MACHINE} == "dane" ]]; then
13-
CMAKE_VERSION=cmake/3.26.3
14-
elif [[ ${MACHINE} == "lassen" ]]; then
15-
CMAKE_VERSION=cmake/3.29.2
11+
if [[ ${MACHINE} == "dane" ]]; then
12+
CMAKE_VERSION=cmake/3.30.5
13+
elif [[ ${MACHINE} == "matrix" ]]; then
14+
CMAKE_VERSION=cmake/3.30.5
15+
elif [[ ${MACHINE} == "tuolumne" ]]; then
16+
CMAKE_VERSION=cmake/3.29
1617
fi
1718

1819
## Eat up the command line arguments so the rest can be forwarded to config-build.

scripts/setupLC-TPL-uberenv.bash

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@ fi
4141

4242
echo "Building all LC TPLs from $GEOS_BRANCH to be installed at $INSTALL_DIR..."
4343

44-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -n 112 --exclusive -p pdebug" $@ &
45-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -n 112 --exclusive -p pdebug" $@ &
46-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -n 112 --exclusive -p pdebug" $@ &
47-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -n 112 --exclusive -p pdebug" $@ &
48-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-8-cuda-11 "%gcc@8.3.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &
49-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-12-cuda-12 "%gcc@12.2.1+cuda~uncrustify cuda_arch=70 ^cuda@12.2.2+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &
50-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-13-cuda-11 "%clang@13.0.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &
51-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-10-cuda-11 "%clang@10.0.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &
52-
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-13-cuda-12 "%clang@13.0.1+cuda~uncrustify cuda_arch=70 ^cuda@12.2.2+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &
44+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 112 --exclusive -t 120 -A vortex" $@ &
45+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -N 1 -n 112 --exclusive -t 120 -A vortex" $@ &
46+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -N 1 -n 112 --exclusive -t 120 -A vortex" $@ &
47+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -N 1 -n 112 --exclusive -t 120 -A vortex" $@ &
48+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-19 "%clang@19.1.3 +docs" "salloc -N 1 -n 112 --exclusive -t 120 -A vortex" $@ &
49+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR matrix gcc-12-cuda-12.6 "%gcc@12.1.1+cuda~uncrustify cuda_arch=90 ^cuda@12.6.0+allow-unsupported-compilers" "salloc -N 1 --exclusive -t 120 -A vortex" $@ &
50+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR matrix gcc-13-cuda-12.9 "%gcc@13.3.1+cuda~uncrustify cuda_arch=90 ^cuda@12.9.1+allow-unsupported-compilers" "salloc -N 1 --exclusive -t 120 -A vortex" $@ &
51+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR matrix clang-14-cuda-12.6 "%clang@14.0.6+cuda~uncrustify cuda_arch=90 ^cuda@12.6.0+allow-unsupported-compilers" "salloc -N 1 --exclusive -t 120 -A vortex" $@ &
52+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR matrix clang-19-cuda-12.9 "%clang@19.1.3+cuda~uncrustify cuda_arch=90 ^cuda@12.9.1+allow-unsupported-compilers" "salloc -N 1 --exclusive -t 120 -A vortex" $@ &
53+
./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR tuolumne cce-20-rocm-6.4.2 "%cce@20.0.0 +rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942" "salloc -N 1 --exclusive -t 120 -A vortex" $@ &
5354

5455
# Note: Estimated completion time is ~90 minutes.
5556
# Check log files for unreported completion of jobs.
@@ -59,4 +60,3 @@ chmod -R g+rx $INSTALL_DIR
5960
chgrp -R GEOS $INSTALL_DIR
6061

6162
echo "Complete"
62-

scripts/setupLC-TPL.bash

Lines changed: 0 additions & 42 deletions
This file was deleted.

scripts/spack_configs/toss_4_x86_64_ib/spack.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@ spack:
5454
target: x86_64
5555
modules: []
5656
extra_rpaths: []
57+
- compiler:
58+
spec: clang@19.1.3
59+
paths:
60+
cc: /usr/tce/packages/clang/clang-19.1.3-magic/bin/clang
61+
cxx: /usr/tce/packages/clang/clang-19.1.3-magic/bin/clang++
62+
f77: /usr/tce/packages/gcc/gcc-13.3.1-magic/bin/gfortran
63+
fc: /usr/tce/packages/gcc/gcc-13.3.1-magic/bin/gfortran
64+
operating_system: rhel8
65+
target: x86_64
66+
modules: []
67+
extra_rpaths: []
5768
- compiler:
5869
spec: gcc@12.1.1
5970
paths:
@@ -126,17 +137,27 @@ spack:
126137
externals:
127138
- spec: mvapich2@2.3%gcc@12.1.1 process_managers=slurm
128139
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1-magic
140+
- spec: mvapich2@2.3%gcc@13.3.1 process_managers=slurm
141+
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-13.3.1-magic
129142
- spec: mvapich2@2.3%gcc@12noAVX process_managers=slurm
130143
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1-magic
131144
- spec: mvapich2@2.3%clang@14.0.6 process_managers=slurm
132145
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6-magic
146+
- spec: mvapich2@2.3%clang@19.1.3 process_managers=slurm
147+
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-19.1.3-magic
133148

134149
intel-oneapi-mkl:
135150
externals:
136151
- spec: intel-oneapi-mkl@2022.1.0 threads=openmp
137152
prefix: /usr/tce/packages/mkl/mkl-2022.1.0/
138153
buildable: False
139-
154+
cuda:
155+
buildable: False
156+
externals:
157+
- spec: cuda@12.6.0 +allow-unsupported-compilers
158+
prefix: /usr/tce/packages/cuda/cuda-12.6.0
159+
- spec: cuda@12.9.1 +allow-unsupported-compilers
160+
prefix: /usr/tce/packages/cuda/cuda-12.9.1
140161
# System level packages to not build
141162
papi:
142163
buildable: False

0 commit comments

Comments
 (0)