Try caliper/trilinos/cmake updates + different rockylinux clang worka…

…round

docker/TotalEnergies/Pangea3.Dockerfile

@@ -54,7 +54,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      ln -s /usr/lib64/liblustreapi.so.1 /usr/lib64/liblustreapi.so && \
 # Run uberenv
      ./scripts/uberenv/uberenv.py \
-       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper@2.11.0~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/pangea-spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

docker/pangea-spack.yaml

@@ -66,6 +66,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

docker/pecan-spack.yaml

@@ -67,6 +67,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

docker/rocky-spack.yaml

@@ -84,6 +84,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
@@ -113,15 +117,15 @@ spack:
       - spec: [email protected]
         prefix: /usr
     cmake:
-      version: [3.28.3]
+      version: [3.28.6]
       buildable: false
       externals:
-      - spec: [email protected].3
+      - spec: [email protected].6
         prefix: /usr/local
     cuda:
       buildable: False
       externals:
-      - spec: cuda@12.5.0 +allow-unsupported-compilers
+      - spec: cuda@12.6.3 +allow-unsupported-compilers
         prefix: /usr/local/cuda
     flex:
       version: [2.6.4]

docker/spack.yaml

@@ -170,6 +170,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

docker/stanford-spack.yaml

@@ -67,6 +67,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

docker/tpl-centos-gcc-cuda.Dockerfile

@@ -82,7 +82,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
 # Create symlink to openmpi include directory
      ln -s /usr/include/openmpi-x86_64 /usr/lib64/openmpi/include && \
      ./scripts/uberenv/uberenv.py \
-       --spec "%gcc@8+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper@2.10.0~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%gcc@8+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

docker/tpl-rockylinux-clang-cuda-12.Dockerfile

@@ -3,15 +3,15 @@ ARG TMP_DIR=/tmp
 ARG SRC_DIR=$TMP_DIR/thirdPartyLibs
 ARG BLD_DIR=$TMP_DIR/build
 
-FROM nvidia/cuda:12.5.0-devel-rockylinux8 AS tpl_toolchain_intersect_geosx_toolchain
+FROM nvidia/cuda:12.6.3-devel-rockylinux8 AS tpl_toolchain_intersect_geosx_toolchain
 ARG SRC_DIR
 
 ARG INSTALL_DIR
 ENV GEOSX_TPL_DIR=$INSTALL_DIR
 
 # Installing dependencies
 RUN dnf clean all && \
-    dnf -y --exclude=clang update && \
+    dnf -y update && \
     dnf -y install \
         which \ 
         clang-17.0.6 \
@@ -46,6 +46,7 @@ ARG BLD_DIR
 
 # Install required packages using dnf
 RUN dnf clean all && \
+    dnf -y update --exclude=clang*,compiler-rt,libomp*,llvm* && \
     dnf -y install \
         tbb-devel \
         bc \
@@ -69,9 +70,8 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
 # Create symlinks to blas/lapack libraries
      ln -s /usr/lib64/libblas.so.3 /usr/lib64/libblas.so && \
      ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \
-# ldflags needed for std::filesystem for caliper
      ./scripts/uberenv/uberenv.py \
-       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^cuda@12.5.0+allow-unsupported-compilers ^caliper@2.11.0~gotcha~sampler~libunwind~libdw~papi ldflags=-lstdc++fs" \
+       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^cuda@12.6.3+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/rocky-spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \
@@ -98,6 +98,7 @@ RUN dnf clean all && \
     rm -rf /var/cache/dnf && \
     dnf -y install dnf-plugins-core && \
     dnf config-manager --set-enabled devel && \
+    dnf -y update --exclude=clang*,compiler-rt,libomp*,llvm* && \
     dnf -y install \
         openssh-clients \
         ca-certificates \

docker/tpl-rockylinux-gcc-cuda-12.Dockerfile

@@ -69,7 +69,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      ln -s /usr/lib64/libblas.so.3 /usr/lib64/libblas.so && \
      ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \
      ./scripts/uberenv/uberenv.py \
-       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper@2.11.0~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%[email protected]+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/rocky-spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

docker/tpl-ubuntu-clang-cuda.Dockerfile

@@ -61,7 +61,7 @@ RUN apt-get install -y --no-install-recommends \
 RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      mkdir -p ${GEOSX_TPL_DIR} && \
      ./scripts/uberenv/uberenv.py \
-       --spec "%clang@10+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper@2.11.0~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%clang@10+cuda~uncrustify~openmp~pygeosx cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

docker/tpl-ubuntu-clang.Dockerfile

@@ -73,7 +73,7 @@ RUN apt-get install -y --no-install-recommends \
 RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      mkdir -p ${GEOSX_TPL_DIR} && \
      ./scripts/uberenv/uberenv.py \
-       --spec "%clang@${CLANG_MAJOR_VERSION} ~openmp+docs ^caliper@2.11.0~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%clang@${CLANG_MAJOR_VERSION} ~openmp+docs ^caliper~gotcha~sampler~libunwind~libdw~papi" \
        --spack-env-file=${SRC_DIR}/docker/spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -123,6 +123,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

scripts/spack_configs/toss_4_x86_64_ib/spack.yaml

@@ -119,6 +119,10 @@ spack:
     camp:
       require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
+    # v2.12.0
+    caliper:
+      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
+
     # v0.9.2
     conduit:
       require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"

scripts/spack_packages/packages/geosx/package.py

@@ -129,7 +129,7 @@ class Geosx(CMakePackage, CudaPackage):
     depends_on('conduit~test~fortran~hdf5_compat~shared')
 
     depends_on('[email protected] ~shared', when='+caliper')
-    depends_on('caliper@2.11.0~gotcha~sampler~libunwind~libdw', when='+caliper')
+    depends_on('caliper~gotcha~sampler~libunwind~libdw', when='+caliper')
 
     depends_on('[email protected] ~shared')
 
@@ -153,8 +153,8 @@ class Geosx(CMakePackage, CudaPackage):
     depends_on("suite-sparse~openmp", when="~openmp")
     depends_on("suite-sparse+openmp", when="+openmp")
 
-    trilinos_packages = '+aztec+stratimikos~amesos2~anasazi~belos~ifpack2~muelu~sacado+thyra'
-    depends_on("trilinos@15.1.1 cflags='-fPIC' cxxflags='-fPIC -include cstdint' fflags='-fPIC'" + trilinos_packages, when='+trilinos')
+    trilinos_packages = '+aztec+stratimikos~amesos2~anasazi~belos~ifpack2~muelu~sacado+thyra+zoltan'
+    depends_on("trilinos@16.0.0 cflags='-fPIC' cxxflags='-fPIC -include cstdint' fflags='-fPIC'" + trilinos_packages, when='+trilinos')
     depends_on("trilinos~openmp", when="~openmp")
     depends_on("trilinos+openmp", when="+openmp")
 

scripts/spack_packages/packages/trilinos/package.py

@@ -47,7 +47,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
     version('master', branch='master')
     version('develop', branch='develop')
     # GEOS Added
-    version("15.1.1", sha256="2108d633d2208ed261d09b2d6b2fbae7a9cdc455dd963c9c94412d38d8aaefe4")
+    version("16.0.0", sha256="46bfc40419ed2aa2db38c144fb8e61d4aa8170eaa654a88d833ba6b92903f309")
 
     version("13.4.1", sha256="5465cbff3de7ef4ac7d40eeff9d99342c00d9d20eee0a5f64f0a523093f5f1b3")
     version("13.4.0", sha256="39550006e059043b7e2177f10467ae2f77fe639901aee91cbc1e359516ff8d3e")