Merge branch 'master' into feature/algiane/pangea3-action

GEOS-DEV · Aug 12, 2024 · b241e85 · b241e85
2 parents 9155059 + 696a3ea
commit b241e85
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/docker_build_tpls.yml b/.github/workflows/docker_build_tpls.yml
@@ -19,20 +19,6 @@ jobs:
 
       matrix:
         include:
-          - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11)
-            DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
-            TPL_DOCKERFILE: docker/Stanford/Dockerfile
-            DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11-no-geosx:0.0.2
-            HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
-            INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU
-            RUNS_ON: ubuntu-latest
-          - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 11.7.1, openblas 0.3.10, zlib 1.2.11)
-            DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11
-            TPL_DOCKERFILE: docker/Stanford/Dockerfile
-            DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11-no-geosx:0.0.2
-            HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake
-            INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
-            RUNS_ON: ubuntu-latest
           - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3)
             DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
             TPL_DOCKERFILE: docker/tpl-ubuntu-gcc.Dockerfile

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -764,7 +764,7 @@ endif()
 
 if( ENABLE_HYPRE )
   set( HYPRE_DIR "${CMAKE_INSTALL_PREFIX}/hypre" )
-  set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-v2.31.0-26-gf6cfb0355.tar.gz" )
+  set( HYPRE_URL "${TPL_MIRROR_DIR}/hypre-v2.31.0-12-g06da35b1a.tar.gz" )
   set( HYPRE_DEPENDS "" )
 
 

diff --git a/scripts/setupLC-TPL.bash b/scripts/setupLC-TPL.bash
@@ -29,6 +29,7 @@ chmod -R g+rx $INSTALL_DIR
 chgrp -R GEOS $INSTALL_DIR
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14           "srun -N 1 -t 90 -n 1 -A vortex" $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12             "srun -N 1 -t 90 -n 1 -A vortex" $@ &
+./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR dane gcc-12             "srun -N 1 -t 90 -n 1 -A vortex" $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen gcc-8-cuda-11    "lalloc 1 -qpdebug"  $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-11 "lalloc 1 -qpdebug"  $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-10-cuda-11 "lalloc 1 -qpdebug"  $@ &

diff --git a/tplMirror/hypre-v2.31.0-12-g06da35b1a.tar.gz b/tplMirror/hypre-v2.31.0-12-g06da35b1a.tar.gz
diff --git a/tplMirror/hypre-v2.31.0-26-gf6cfb0355.tar.gz b/tplMirror/hypre-v2.31.0-26-gf6cfb0355.tar.gz