Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ jobs:
script_args+=(--enable-hypre "${{ inputs.ENABLE_HYPRE }}")
fi

# Hypredrive is off by default so the TPL image host-config cannot enable it.
ENABLE_HYPREDRV=${{ inputs.ENABLE_HYPREDRV }}
if [ ! -z "${{ inputs.ENABLE_HYPREDRV }}" ]; then
script_args+=(--enable-hypredrv "${{ inputs.ENABLE_HYPREDRV }}")
Expand All @@ -265,7 +264,7 @@ jobs:
# Trilinos
ENABLE_TRILINOS=${{ inputs.ENABLE_TRILINOS }}
docker_args+=(-e ENABLE_HYPRE=${ENABLE_HYPRE:-OFF})
docker_args+=(-e ENABLE_HYPREDRV=${ENABLE_HYPREDRV:-OFF})
docker_args+=(-e ENABLE_HYPREDRV=${ENABLE_HYPREDRV:-ON})
docker_args+=(-e ENABLE_HYPRE_DEVICE=${ENABLE_HYPRE_DEVICE:-CPU})
docker_args+=(-e ENABLE_TRILINOS=${ENABLE_TRILINOS:-ON})
docker_args+=(-e GEOS_BUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }})
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@ jobs:
steps:
- name: Check that the PR is not a draft (cancel rest of jobs otherwise)
id: extract_pr_info
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
set -euo pipefail

if [[ "${{ github.event_name }}" == "pull_request" ]]; then
draft_status="${{ github.event.pull_request.draft }}"
PR_JSON=$(curl --fail --silent --show-error \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${GITHUB_TOKEN}" \
https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.number }})
draft_status=$(jq -r '.draft' <<< "${PR_JSON}")

echo "Draft status of PR is ${draft_status}."
if [[ "${draft_status}" == "true" ]]; then
Expand Down
13 changes: 0 additions & 13 deletions host-configs/LBL/anag-gcc.cmake

This file was deleted.

55 changes: 0 additions & 55 deletions host-configs/LBL/cori-gcc@8.1.0.cmake

This file was deleted.

56 changes: 0 additions & 56 deletions host-configs/LBL/cori-intel.cmake

This file was deleted.

21 changes: 0 additions & 21 deletions host-configs/LBL/corigpu-gcc.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-12_tpls/gcc-12.1.

set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-12_tpls/gcc-12.1.1/hypre-git.9fbaf60dc9435e71ff5af984f1e12e2bf8be6ad8_master-l3nuajfedgl7ova5u2fheltf6euxupvq" CACHE PATH "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-12_tpls/gcc-12.1.1/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-6fr7ry746mawo3hg35sap7j43nfijbzi" CACHE PATH "")

Expand Down
2 changes: 1 addition & 1 deletion host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@13.3.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-13_tpls/gcc-13.3.

set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-13_tpls/gcc-13.3.1/hypre-git.9fbaf60dc9435e71ff5af984f1e12e2bf8be6ad8_master-obgrfae6tjeywyz5xufz77nm44qexv55" CACHE PATH "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-gcc-13_tpls/gcc-13.3.1/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-s75vosid4wxvttywirk75zdaqxdb5zw7" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-14_tpls/llvm-14.

set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-14_tpls/llvm-14.0.6/hypre-git.9fbaf60dc9435e71ff5af984f1e12e2bf8be6ad8_master-fiuodd3ym2fwfict7krpl3law4lvwfht" CACHE PATH "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-14_tpls/llvm-14.0.6/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-bamxtt67tqifn6kkbkqis7m3qq3ul4on" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-19_tpls/llvm-19.

set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-19_tpls/llvm-19.1.3/hypre-git.9fbaf60dc9435e71ff5af984f1e12e2bf8be6ad8_master-ggcgviv6w5o72uguflziyhkfjclijbnq" CACHE PATH "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/dane-llvm-19_tpls/llvm-19.1.3/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-e2nxbaosj6yo46uxk64mdy3fhy4f2ebt" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-gcc-12-cuda-12.6_tpls/

set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-wwxdf7tyzd3nfvvijymtd3fzmrbf6ngs" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-gcc-13-cuda-12.9_tpls/

set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-dkkq24wpwi457ars3gne3wkpa62s3wxi" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-llvm-14-cuda-12.6_tpls

set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-cccwwkyyauh5ma5pq7ibwt6hhlsauw2c" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-llvm-19-cuda-12.9_tpls

set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-4cshncaancog3oyenmrqiaxxajvngwsv" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/tuolumne-cce-20-rocm-6.4.3_tp

set(ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-b4cizv3pkm255dru3juyk4vpne4lzr2h" CACHE PATH "")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/tuolumne-llvm-amdgpu-6.4.3_tp

set(ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "")

set(ENABLE_HYPREDRV OFF CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-08-12/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/hypredrive-git.4eb4f1b126332844feaaf941e32ae5dc125e5bdc_master-6vvzj7xbvkl6imlstcj5n2wlw2uatzqj" CACHE PATH "")

Expand Down
29 changes: 0 additions & 29 deletions host-configs/ORNL/ascent-gcc@8.1.1.cmake

This file was deleted.

1 change: 1 addition & 0 deletions host-configs/ORNL/frontier-base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set( ENABLE_PAPI OFF CACHE BOOL "" )
set( ENABLE_ESSL OFF CACHE BOOL "" )

set( ENABLE_TRILINOS OFF CACHE BOOL "" )
set( ENABLE_HYPREDRV ON CACHE BOOL "" )

set( CAMP_STANDALONE TRUE CACHE BOOL "" )

Expand Down
1 change: 1 addition & 0 deletions host-configs/ORNL/frontier-cce@15.0.0.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set( SUITESPARSE_DIR "${GEOS_TPL_DIR}/suite-sparse-5.10.1" CACHE PATH "" )
# HYPRE options
set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" )
set( ENABLE_HYPRE_MIXINT TRUE CACHE STRING "" )
set( ENABLE_HYPREDRV ON CACHE BOOL "" )

set( HYPRE_DIR "/lustre/orion/geo127/world-shared/hypre/hypre_v2.27.0-218-ge2806c33d_cce-15.0.0_rocm-5.4.3_mixint_umpire-2022.03.0_caliper-2.8.0_rel/" CACHE PATH "" )

Expand Down
1 change: 1 addition & 0 deletions host-configs/Stanford/sherlock-gcc10-cuda12-sm70.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ set(ENABLE_OPENMP OFF CACHE BOOL "" FORCE)
set(GEOS_LA_INTERFACE "Hypre" CACHE STRING "" FORCE)
set(ENABLE_HYPRE ON CACHE BOOL "" FORCE)
set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "" FORCE)
set(ENABLE_HYPREDRV ON CACHE BOOL "")
set(ENABLE_PETSC OFF CACHE BOOL "" FORCE)
set(ENABLE_TRILINOS OFF CACHE BOOL "" FORCE)
1 change: 1 addition & 0 deletions host-configs/Stanford/sherlock-gcc10.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ set(LAPACK_LIBRARIES "${OPENBLAS_ROOT}/lib/libopenblas.so" CACHE STRING "")

set(ENABLE_VALGRIND OFF CACHE BOOL "")
set(ENABLE_CALIPER ON CACHE BOOL "")
set(ENABLE_HYPREDRV ON CACHE BOOL "")

if (DEFINED ENV{GEOSX_TPL_DIR})
set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE)
Expand Down
2 changes: 2 additions & 0 deletions host-configs/TOTAL/maple-common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ set( ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "" FORCE )
# Enale caliper instrumentation
set( ENABLE_CALIPER ON CACHE BOOL "" )

set( ENABLE_HYPREDRV ON CACHE BOOL "" )

# Disable doxygen. No valid libiconv available
set( ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ set( ENABLE_CUDA ON CACHE BOOL "" )
#########################################################################
# Set HYPRE to use CUDA
set( ENABLE_HYPRE_DEVICE "CUDA" CACHE PATH "" FORCE )
set( ENABLE_HYPREDRV ON CACHE BOOL "" )

add_third_party_libraries()

Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ set( MPIEXEC_EXECUTABLE mpiexec CACHE PATH "" FORCE )
#########################################################################
# OTHER OPTIONS
#########################################################################
set( ENABLE_HYPREDRV ON CACHE BOOL "" )
add_third_party_libraries()
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ set( ENABLE_CUDA ON CACHE BOOL "" )
#########################################################################
# Set HYPRE to use CUDA
set( ENABLE_HYPRE_DEVICE "CUDA" CACHE PATH "" FORCE )
set( ENABLE_HYPREDRV ON CACHE BOOL "" )

add_third_party_libraries()

Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ set( ENABLE_OPENMP ON CACHE PATH "" FORCE )
#########################################################################
# OTHER OPTIONS
#########################################################################
set( ENABLE_HYPREDRV ON CACHE BOOL "" )
add_third_party_libraries()
1 change: 1 addition & 0 deletions host-configs/apple/macOS_arm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ set( HOMEBREW_DIR "/opt/homebrew" )
set( CONFIG_NAME "macOS_arm" )

include(${CMAKE_CURRENT_LIST_DIR}/macOS_base.cmake)
set(ENABLE_HYPREDRV ON CACHE BOOL "")
2 changes: 2 additions & 0 deletions host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ set(ENABLE_PVTPackage ON CACHE BOOL "" FORCE)
set(ENABLE_CUDA "OFF" CACHE PATH "" FORCE)
set(ENABLE_OPENMP "OFF" CACHE PATH "" FORCE)

set(ENABLE_HYPREDRV ON CACHE BOOL "")

set(ENABLE_CALIPER "OFF" CACHE PATH "" FORCE )

set( BLAS_LIBRARIES ${HOMEBREW_DIR}/opt/lapack/lib/libblas.dylib CACHE PATH "" FORCE )
Expand Down
1 change: 1 addition & 0 deletions host-configs/apple/macOS_x86.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ set( HOMEBREW_DIR "/usr/local" )
set( CONFIG_NAME "macOS_x86" )

include(${CMAKE_CURRENT_LIST_DIR}/macOS_base.cmake)
set(ENABLE_HYPREDRV ON CACHE BOOL "")
Loading
Loading