GEOS-DEV · rrsettgast · Sep 19, 2025 · May 29, 2025 · May 29, 2025 · May 29, 2025
diff --git a/docker/Stanford/Dockerfile b/docker/Stanford/Dockerfile
@@ -23,6 +23,7 @@ RUN yum install -y \
     # xz \
     unzip \
     bzip2 \
+    gnupg \
     && pip3 install virtualenv
 
 # Set locale to bypass ascii codec decode error

diff --git a/docker/TotalEnergies/Dockerfile b/docker/TotalEnergies/Dockerfile
@@ -22,6 +22,7 @@ RUN yum install --disablerepo=intel-mkl-repo -y \
     # xz \
     unzip \
     bzip2 \
+    gnupg2 \
     && pip3 install virtualenv
 
 # Install clingo for Spack

diff --git a/docker/TotalEnergies/Pangea3.Dockerfile b/docker/TotalEnergies/Pangea3.Dockerfile
@@ -19,6 +19,7 @@ RUN dnf clean all && \
         gettext-devel \
         libtool \
         bzip2 \
+        gnupg2 \
         unzip
 
 # All the environment variables defined in this Dockerfile

diff --git a/docker/TotalEnergies/pecan.Dockerfile b/docker/TotalEnergies/pecan.Dockerfile
@@ -34,6 +34,7 @@ RUN yum install -y \
     gcc-c++ \
     wget \
     bzip2 \
+    gnupg \
     zlib-devel
 
 WORKDIR /tmp/src

diff --git a/docker/pangea-spack.yaml b/docker/pangea-spack.yaml
@@ -12,6 +12,11 @@ spack:
   # Regular TPLs do not need views
   view: false
 
+  # Include shared variants and versions
+  include:
+  - ../defaults.yaml
+  - ../versions.yaml
+
   compilers::
   - compiler:
       spec: gcc@=9.4.0
@@ -38,44 +43,6 @@ spack:
         lapack: [openblas]
         mpi: [openmpi]
 
-
-    # v0.6.2
-    blt:
-      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
-
-    hypre:
-      require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
-
-    # v2025.0.3.0
-    chai:
-      require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
-
-    # v2025.0.3.0
-    umpire:
-      require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
-
-    # v2025.0.3.0
-    raja:
-      require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
-
-    # v2025.0.3.0
-    camp:
-      require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
-
-    # v2.12.0
-    caliper:
-      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
-
-    # v0.9.2
-    conduit:
-      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
-
-    uncrustify:
-      require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
-
-    superlu-dist:
-      require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
-
     autoconf:
       externals:
       - spec: autoconf@2.69

diff --git a/docker/pecan-spack.yaml b/docker/pecan-spack.yaml
@@ -12,6 +12,11 @@ spack:
   # Regular TPLs do not need views
   view: false
 
+  # Include shared variants and versions
+  include:
+  - ../defaults.yaml
+  - ../versions.yaml
+
   compilers::
   # Pecan CPU/GPU compiler
   - compiler:
@@ -38,44 +43,6 @@ spack:
         lapack: [intel-mkl]
         mpi: [openmpi]
 
-
-    # v0.6.2
-    blt:
-      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
-
-    hypre:
-      require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
-
-    # v2025.0.3.0
-    chai:
-      require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
-
-    # v2025.0.3.0
-    umpire:
-      require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
-
-    # v2025.0.3.0
-    raja:
-      require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
-
-    # v2025.0.3.0
-    camp:
-      require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
-
-    # v2.12.0
-    caliper:
-      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
-
-    # v0.9.2
-    conduit:
-      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
-
-    uncrustify:
-      require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
-
-    superlu-dist:
-      require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
-
     autoconf:
       version: [2.71]
       buildable: false

diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml
@@ -12,6 +12,11 @@ spack:
   # Regular TPLs do not need views
   view: false
 
+  # Include shared variants and versions
+  include:
+  - ../defaults.yaml
+  - ../versions.yaml
+
   compilers::
   - compiler:
       extra_rpaths: []
@@ -51,44 +56,6 @@ spack:
         lapack: [netlib-lapack]
         mpi: [openmpi]
 
-
-    # v0.6.2
-    blt:
-      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
-
-    hypre:
-      require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
-
-    # v2025.0.3.0
-    chai:
-      require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
-
-    # v2025.0.3.0
-    umpire:
-      require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
-
-    # v2025.0.3.0
-    raja:
-      require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
-
-    # v2025.0.3.0
-    camp:
-      require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
-
-    # v2.12.0
-    caliper:
-      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
-
-    # v0.9.2
-    conduit:
-      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
-
-    uncrustify:
-      require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
-
-    superlu-dist:
-      require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
-
     autoconf:
       version: [2.71]
       buildable: false

diff --git a/docker/spack.yaml b/docker/spack.yaml
@@ -12,6 +12,12 @@ spack:
   # Regular TPLs do not need views
   view: false
 
+  # Include shared variants and versions
+  include:
+  - ../defaults.yaml
+  - ../versions.yaml
+
+
   compilers::
   - compiler:
       extra_rpaths: []
@@ -117,44 +123,6 @@ spack:
         lapack: [netlib-lapack]
         mpi: [openmpi]
 
-
-    # v0.6.2
-    blt:
-      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
-
-    hypre:
-      require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
-
-    # v2025.0.3.0
-    chai:
-      require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
-
-    # v2025.0.3.0
-    umpire:
-      require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
-
-    # v2025.0.3.0
-    raja:
-      require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
-
-    # v2025.0.3.0
-    camp:
-      require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
-
-    # v2.12.0
-    caliper:
-      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
-
-    # v0.9.2
-    conduit:
-      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
-
-    uncrustify:
-      require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
-
-    superlu-dist:
-      require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
-
     autoconf:
       version: [2.71]
       buildable: false

diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml
@@ -13,6 +13,11 @@ spack:
   # Regular TPLs do not need views
   view: false
 
+  # Include shared variants and versions
+  include:
+  - ../defaults.yaml
+  - ../versions.yaml
+
   compilers::
   # Sherlock CPU/GPU Compiler (centos7 x86_64)
   - compiler:
@@ -39,43 +44,6 @@ spack:
         blas: [openblas]
         lapack: [openblas]
 
-    # v0.6.2
-    blt:
-      require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop"
-
-    hypre:
-      require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c"
-
-    # v2025.0.3.0
-    chai:
-      require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"
-
-    # v2025.0.3.0
-    umpire:
-      require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"
-
-    # v2025.0.3.0
-    raja:
-      require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"
-
-    # v2025.0.3.0
-    camp:
-      require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"
-
-    # v2.12.0
-    caliper:
-      require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c"
-
-    # v0.9.2
-    conduit:
-      require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop"
-
-    uncrustify:
-      require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2"
-
-    superlu-dist:
-      require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1"
-
     autoconf:
       buildable: false
       externals:

diff --git a/docker/tpl-centos-gcc-cuda.Dockerfile b/docker/tpl-centos-gcc-cuda.Dockerfile
@@ -48,6 +48,7 @@ RUN yum -y install \
     # xz \
     unzip \
     bzip2 \
+    gnupg \
     && pip3 install virtualenv
 
 # Install clingo for Spack

diff --git a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile
@@ -28,6 +28,7 @@ RUN dnf clean all && \
         unzip \
         mpfr-devel \
         bzip2 \
+        gnupg \
         xz \
         python3-virtualenv
 

diff --git a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile
@@ -26,6 +26,7 @@ RUN dnf clean all && \
         unzip \
         mpfr-devel \
         bzip2 \
+        gnupg \
         xz \
         python3-virtualenv
 

diff --git a/docker/tpl-ubuntu-clang-cuda.Dockerfile b/docker/tpl-ubuntu-clang-cuda.Dockerfile
@@ -33,6 +33,8 @@ RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime && \
         unzip \
         libmpfr-dev \
         lbzip2 \
+        bzip2 \
+        gnupg \
         virtualenv
 
 # Install clingo for Spack

diff --git a/docker/tpl-ubuntu-clang.Dockerfile b/docker/tpl-ubuntu-clang.Dockerfile
@@ -38,6 +38,8 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
     unzip \
     libmpfr-dev \
     lbzip2 \
+    bzip2 \
+    gnupg \
     virtualenv
 
 # Install clingo for Spack

diff --git a/docker/tpl-ubuntu-gcc.Dockerfile b/docker/tpl-ubuntu-gcc.Dockerfile
@@ -63,6 +63,8 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
     unzip \
     libmpfr-dev \
     lbzip2 \
+    bzip2 \
+    gnupg \
     virtualenv
 
 # Install clingo for Spack

diff --git 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 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 dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ &
-./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +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 112 --exclusive -p pdebug" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs"  "salloc -n 112 --exclusive -p pdebug" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13      "%gcc@13.3.1 +docs"   "salloc -n 112 --exclusive -p pdebug" $@ &
+./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14    "%clang@14.0.6 +docs" "salloc -n 112 --exclusive -p pdebug" $@ &
 ./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 gcc-12-cuda-12 "%gcc@12.2.1+cuda~uncrustify cuda_arch=70 ^cuda@12.2.2+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" $@ &
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ RUN yum install -y \ @@
         # xz \
         unzip \
         bzip2 \
+        gnupg \
         && pip3 install virtualenv
     # Set locale to bypass ascii codec decode error
@@ Expand Down @@