Skip to content

Commit cefddb8

Browse files
victorapmcastelletto1rrsettgast
authored
Update TPLs (#340)
* Fix zlib issue * Add cxxstd variant to geos package * [Update]: caliper v2.12.0 -> v2.14.0 * [Update]: RAJA v2025.03.0 -> v2025.12.0 * [Update]: CHAI v2025.03.0 -> v2025.12.0 * [Update]: Umpire v2025.03.0 -> v2025.12.0 * [Update]: BLT v0.6.2 -> v0.7.1 * Bump spack packages commit to Feb 25th 2026 * [Update]: conduit v0.9.2 -> v0.9.5 * Fix LC-uberenv script so that the compiler choice is propagated to deps * [Update]: spack v1.1.0 -> v1.1.1 * Fix superlu build issue with cce (Input from Brian) * Fixing spack config for tuo so it uses the correct rocm versions * Fix hypre+shared build * Update runner * Fix CA issue * Fix version mismatch * srun -> salloc * Fix cray-mpich external paths for tuolumne builds --------- Co-authored-by: Nicola Castelletto <38361926+castelletto1@users.noreply.github.com> Co-authored-by: Randolph Settgast <settgast1@llnl.gov>
1 parent 3ac1991 commit cefddb8

16 files changed

Lines changed: 219 additions & 161 deletions

‎.github/workflows/docker_build_tpls.yml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,15 @@ jobs:
5656
- name: Rockylinux (8, gcc 13.3, cuda 12.9.1)
5757
DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1
5858
TPL_DOCKERFILE: docker/tpl-rockylinux-gcc-cuda-12.Dockerfile
59-
RUNS_ON: Runner_4core_16GB
59+
RUNS_ON: streak2
60+
NPROC: 8
61+
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro"
6062
- name: Rockylinux (8, clang 17.0.6, cuda 12.9.1)
6163
DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1
6264
TPL_DOCKERFILE: docker/tpl-rockylinux-clang-cuda-12.Dockerfile
63-
RUNS_ON: Runner_4core_16GB
65+
RUNS_ON: streak2
66+
NPROC: 8
67+
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro"
6468
# - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11)
6569
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
6670
# TPL_DOCKERFILE: docker/Stanford/Dockerfile
@@ -89,6 +93,15 @@ jobs:
8993
- name: Print environment
9094
run: printenv
9195

96+
- name: Inject CA certificate into Docker build
97+
if: matrix.RUNS_ON == 'streak2'
98+
run: |
99+
# 1. Copy the host's CA bundle into the Docker build context
100+
cp /etc/pki/tls/certs/ca-bundle.crt ./ca-bundle.crt
101+
102+
# 2. Inject the COPY and update-ca-trust commands right before dnf runs
103+
sed -i '/RUN dnf clean all/i COPY ca-bundle.crt /etc/pki/ca-trust/source/anchors/ca-bundle.crt\nRUN update-ca-trust extract' ${{ matrix.TPL_DOCKERFILE }}
104+
92105
- name: Run the docker build docker script
93106
env:
94107
TPL_DOCKERFILE: ${{ matrix.TPL_DOCKERFILE }}

‎.uberenv_config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"spack_configs_path": "scripts/spack_configs",
77
"spack_packages_path": "scripts/spack_packages/packages",
88
"spack_url": "https://github.com/spack/spack",
9-
"spack_commit": "0c2be44e4ece21eb091ad5de4c97716b7c6d4c87",
10-
"spack_commit_note": "v1.1.0 (Nov 14th 2025)",
11-
"spack_packages_commit": "cfa8d650480c409de2d568cf1355bf7e509f4c1c",
12-
"spack_packages_note": "Jan 21st 2026"
9+
"spack_commit": "2e2169d5282d166f63e3ee4db8d4446c43cefa8a",
10+
"spack_commit_note": "v1.1.1 (Jan 14th 2026)",
11+
"spack_packages_commit": "3dd98680871078353a28ee508fa76c7554f918fa",
12+
"spack_packages_note": "Feb 25th 2026"
1313
}

‎CMakeLists.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set( ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE )
1515
################################
1616
# BLT
1717
################################
18+
set( CXX_STANDARD 17 )
1819
set( BLT_CXX_STD c++17 CACHE STRING "" FORCE )
1920

2021
if (DEFINED BLT_SOURCE_DIR)
@@ -235,7 +236,7 @@ list(APPEND build_list hdf5 )
235236
# Conduit
236237
################################
237238
set(CONDUIT_DIR "${CMAKE_INSTALL_PREFIX}/conduit")
238-
set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.9.2.tar.gz")
239+
set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-v0.9.5-src-with-blt.tar.gz")
239240
message(STATUS "Building Conduit found at ${CONDUIT_URL}")
240241

241242
if( ${ENABLE_MPI} )
@@ -282,7 +283,7 @@ ExternalProject_Add( conduit
282283
-D CMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
283284
-D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
284285
-D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
285-
-D BLT_CXX_STD:STRING=c++14
286+
-D BLT_CXX_STD:STRING=${BLT_CXX_STD}
286287
)
287288

288289
list(APPEND build_list conduit )
@@ -334,7 +335,7 @@ list(APPEND build_list silo )
334335

335336

336337
set(RAJA_DIR "${CMAKE_INSTALL_PREFIX}/raja")
337-
set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.03.0.tar.gz")
338+
set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.12.0.tar.gz")
338339

339340

340341
message(STATUS "Building RAJA found at ${RAJA_URL}")
@@ -374,7 +375,7 @@ list(APPEND build_list raja )
374375
# CHAI
375376
################################
376377
set(CHAI_DIR "${CMAKE_INSTALL_PREFIX}/chai")
377-
set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.03.0.tar.gz")
378+
set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.12.0.tar.gz")
378379
message(STATUS "Building CHAI found at ${CHAI_URL}")
379380

380381
ExternalProject_Add( chai
@@ -448,7 +449,7 @@ if (ENABLE_CALIPER)
448449

449450

450451
set(CALIPER_DIR "${CMAKE_INSTALL_PREFIX}/caliper")
451-
set(CALIPER_URL "${TPL_MIRROR_DIR}/Caliper-2.12.0.tar.gz")
452+
set(CALIPER_URL "${TPL_MIRROR_DIR}/Caliper-2.14.0.tar.gz")
452453
message(STATUS "Building Caliper found at ${CALIPER_URL}")
453454

454455
set(CALIPER_WITH_CUPTI OFF)
@@ -1204,7 +1205,7 @@ ExternalProject_Add( fmt
12041205
-D CMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
12051206
-D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
12061207
-D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
1207-
-D CMAKE_CXX_STANDARD=14
1208+
-D CMAKE_CXX_STANDARD=${CXX_STANDARD}
12081209
-D CMAKE_CXX_VISIBILITY_PRESET:STRING=default
12091210
-D CMAKE_VISIBILITY_INLINES_HIDDEN:BOOL=OFF
12101211
-D FMT_TEST:BOOL=OFF )

‎cmake/blt‎

Submodule blt updated 611 files

‎scripts/setupLC-TPL-uberenv.bash‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,28 @@ function launch_jobs() {
8585

8686
echo "-----> Launching jobs for [${machine}]..."
8787

88-
# Note: The max. time allowed on the debug queue is 1h. If we need more, switch to pbatch
88+
# Note: The max time allowed on the debug queue is 1h. If we need more, switch to pbatch
8989
case "$machine" in
9090
dane)
91-
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
92-
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" &
93-
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
94-
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" &
95-
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" &
91+
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
92+
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %%gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" &
93+
"${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" &
94+
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %%clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" &
95+
"${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %%clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" &
9696
;;
9797

9898
matrix)
99-
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
100-
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
101-
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
102-
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
103-
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
99+
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
100+
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %%gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
101+
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %%gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
102+
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %%clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
103+
"${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %%clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" &
104104
;;
105105

106106
tuo|tuolumne)
107-
ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex"
108-
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" &
109-
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.2-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %llvm-amdgpu_6_4_2 ${COMMON}" "${ALLOC_CMD}" "$@" &
107+
ALLOC_CMD="salloc -N 1 --exclusive -p pdebug -t 60 -A vortex"
108+
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" &
109+
"${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.3 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%llvm-amdgpu_6_4_3 ${COMMON}" "${ALLOC_CMD}" "$@" &
110110
;;
111111

112112
*)

0 commit comments

Comments
 (0)