change cuda arch for streak2

.github/workflows/docker_build_tpls.yml

@@ -72,7 +72,7 @@ jobs:
           #   DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
           #   TPL_DOCKERFILE: docker/Stanford/Dockerfile
           #   DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-cmake3.31.4-no-geosx:0.0.1
-          #   SPEC: "~pygeosx~openmp cuda_arch=70 %gcc@10.1.0 ^cuda@12.4.0+allow-unsupported-compilers"
+          #   SPEC: "~pygeosx~openmp cuda_arch=86 %gcc@10.1.0 ^cuda@12.4.0+allow-unsupported-compilers"
           #   INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
           #   RUNS_ON: ubuntu-latest
 

docker/tpl-centos-gcc-cuda.Dockerfile

@@ -81,7 +81,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 ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "%gcc@8+cuda~uncrustify~openmp~pygeosx cuda_arch=86 ^cuda@11.8.0+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

@@ -81,7 +81,7 @@ RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
      ln -s /usr/lib64/liblapack.so.3 /usr/lib64/liblapack.so && \
      scl enable gcc-toolset-13 ' \
      ./scripts/uberenv/uberenv.py \
-       --spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=70 %clang-17 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=86 %clang-17 ^cuda@12.9.1+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-rockylinux-gcc-cuda-12.Dockerfile

@@ -67,7 +67,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 "+cuda~uncrustify~openmp~pygeosx lai=hypre cuda_arch=70 %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "+cuda~uncrustify~openmp~pygeosx lai=hypre cuda_arch=86 %gcc-13 ^cuda@12.9.1+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

@@ -62,7 +62,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 "+cuda~uncrustify~openmp~pygeosx cuda_arch=70 %clang-10  ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
+       --spec "+cuda~uncrustify~openmp~pygeosx cuda_arch=86 %clang-10  ^cuda@11.8.0+allow-unsupported-compilers ^caliper~gotcha~sampler~libunwind~libdw~papi" \
       --spack-env-file=${SRC_DIR}/docker/ubuntu20-clang-cuda-spack.yaml \
        --project-json=.uberenv_config.json \
        --prefix ${GEOSX_TPL_DIR} \

scripts/spack_configs/macOS/spack.yaml

@@ -26,9 +26,6 @@ spack:
           f77: /opt/homebrew/bin/gfortran 
           fc: /opt/homebrew/bin/gfortran  
         flags:
-          cflags:
-          cxxflags:
-          fflags:
           cppflags: -I/opt/homebrew/opt/openblas/include
           ldflags: -L/opt/homebrew/opt/openblas/lib
         operating_system: sequoia
@@ -45,9 +42,6 @@ spack:
         flags:
           cppflags: -I/opt/homebrew/opt/openblas/include
           ldflags: -L/opt/homebrew/opt/openblas/lib
-          cflags:
-          cxxflags:
-          fflags:
         operating_system: sequoia
         target: aarch64
         modules: []
@@ -61,6 +55,7 @@ spack:
         mpi: [openmpi]
         blas: [openblas]
         lapack: [openblas]
+      variants: "~openmp"
 
     openblas:
       buildable: False
@@ -134,7 +129,7 @@ spack:
       buildable: False
       externals:
         - spec: addr2line@2.43.1
-          prefix: /opt/homebrew/opt/binutils     
+          prefix: /opt/homebrew/opt/binutils
 
     zlib:
       buildable: False
@@ -145,5 +140,5 @@ spack:
     python:
       buildable: false
       externals:
-        - spec: python@3.13.2
-          prefix: /opt/homebrew/opt/python@3.13
+        - spec: python@3.14.3
+          prefix: /opt/homebrew/opt/python@3.14

scripts/spack_configs/versions.yaml

@@ -20,7 +20,7 @@ packages:
 
   # master - 01/23/26
   hypre:
-    require: "@git.8b0093306228fef1b92384d9face7fbe5a63b460=master"
+    require: "@git.94958704510ded75a0db8286b9a623da1fa1ee41=master"
 
   # v2025.0.3.0
   chai:

scripts/spack_packages/packages/geosx/package.py

@@ -172,7 +172,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage):
     # -Wno-error=implicit-function-declaration needed for 'METIS_PartMeshDual' error
     depends_on("scotch@7.0.8 ~compression +mpi +esmumps +int64 determinism=FULL ~shared ~metis build_system=cmake cflags='-fPIC' cxxflags='-fPIC'", when='+scotch')
 
-    depends_on('suite-sparse@5.10.1')
+    depends_on('suite-sparse@5.13.0')
     depends_on("suite-sparse~openmp", when="~openmp")
     depends_on("suite-sparse+openmp", when="+openmp")