From 30f9fe3d2def1bf18f38df80b77509972dbef1a0 Mon Sep 17 00:00:00 2001
From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:42:01 -0800
Subject: [PATCH 1/2] Add caliper to Hypre when caliper is enabled.

---
 scripts/spack_packages/packages/geosx/package.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py
index c9d14c0d..6688338b 100644
--- a/scripts/spack_packages/packages/geosx/package.py
+++ b/scripts/spack_packages/packages/geosx/package.py
@@ -164,6 +164,7 @@ class Geosx(CMakePackage, CudaPackage):
         depends_on("hypre +cuda+superlu-dist+mixedint+mpi+umpire+unified-memory~shared cflags='-fPIC' cxxflags='-fPIC'", when='+cuda')
         depends_on("hypre~openmp", when="~openmp")
         depends_on("hypre+openmp", when="+openmp")
+        depends_on("hypre+caliper", when="+caliper")
 
     with when('+cuda'):
         for sm_ in CudaPackage.cuda_arch_values:

From bc04bd9ae6d1e37a31f1b4129a00354b06ec8a23 Mon Sep 17 00:00:00 2001
From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:45:28 -0800
Subject: [PATCH 2/2] add +caliper

---
 scripts/setupLC-TPL-uberenv.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/setupLC-TPL-uberenv.bash b/scripts/setupLC-TPL-uberenv.bash
index 6d34fc98..1ce89cce 100755
--- a/scripts/setupLC-TPL-uberenv.bash
+++ b/scripts/setupLC-TPL-uberenv.bash
@@ -41,10 +41,10 @@ fi
 
 echo "Building all LC TPLs from $GEOS_BRANCH to be installed at $INSTALL_DIR..."
 
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby clang-14 "%clang@14.0.6 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12noAVX "%gcc@12noAVX +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby clang-14 "%clang@14.0.6 +docs+caliper" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12 "%gcc@12.1.1 +docs+caliper" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12noAVX "%gcc@12noAVX +docs+caliper" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs+caliper" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
 ./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" $@ &
 ./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" $@ &
 ./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" $@ &