From fa94936b4e97fba1c075d19b958ffdd8006aba01 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 1 May 2026 00:21:59 -0700 Subject: [PATCH 01/23] update CI images and remove old specs --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci_tests.yml | 135 +++++++++--------- .../co2_flux_3d.xml | 42 +++--- ...class09_pb3_hystRelperm_iterative_base.xml | 8 +- .../Class09Pb3/class09_pb3_smoke_3d.xml | 10 +- 6 files changed, 97 insertions(+), 102 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8cad1411244..69ac2cc78ba 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ # If you are building the current `Dockerfile` to use codespaces in the cloud, # you most likely want to define this variable in the `.devcontainer/devcontainer.json` file. ARG GEOS_TPL_TAG -FROM docker.io/geosx/ubuntu20.04-gcc10:${GEOS_TPL_TAG} +FROM docker.io/geosx/ubuntu24.04-gcc13:${GEOS_TPL_TAG} RUN apt-get update RUN apt-get install -y \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e5913100b8d..d3984104710 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "344-968" + "GEOS_TPL_TAG": "349-1008" } }, "runArgs": [ diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index a1de2583cb0..0d4b83bef67 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -110,7 +110,7 @@ jobs: CMAKE_BUILD_TYPE: Release DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} HOST_CONFIG: /spack-generated.cmake - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 RUNS_ON: ubuntu-22.04 USE_SCCACHE: false @@ -124,22 +124,23 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3) + - name: Ubuntu 24.04 - gcc 12 CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 + GCP_BUCKET: geosx/ubuntu24.04-gcc12 BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu debug (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces + - name: Ubuntu 24.04 - gcc 13 (docs) debug BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" CMAKE_BUILD_TYPE: Debug - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON RUNS_ON: streak2 NPROC: 8 @@ -147,74 +148,69 @@ jobs: HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces + - name: Ubuntu 24.04 - gcc 13 (docs) CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + GCP_BUCKET: geosx/ubuntu24.04-gcc13 BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu (22.04, gcc 11.4.0, open-mpi 4.1.2) + - name: Ubuntu 24.04 - clang 19 CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 + DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + BUILD_SHARED_LIBS: ON + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake + + - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/ubuntu24.04-clang20 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF - GCP_BUCKET: geosx/ubuntu22.04-gcc11 HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) + - name: Rocky Linux 8 - gcc 12 CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 - GCP_BUCKET: geosx/ubuntu22.04-gcc12 + DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2, +hypredrive) + - name: Rocky Linux 8 - gcc 13 CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12-hypredrive - GCP_BUCKET: geosx/ubuntu22.04-gcc12-hypredrive + DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) - NO BOUNDS CHECK + - name: Rocky Linux 8 - clang 19 CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 - GCP_BUCKET: geosx/ubuntu22.04-gcc12 + DOCKER_REPOSITORY: geosx/rockylinux8-clang19 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: OFF + GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - #- name: Ubuntu (22.04, clang 15.0.7, open-mpi 4.1.2) - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: ON - # BUILD_SHARED_LIBS: ON - # HOST_CONFIG: /spack-generated.cmake - - #- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10) - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: OFF - # GCP_BUCKET: geosx/Sherlock-CPU - # HOST_CONFIG: /spack-generated.cmake -# # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake - # BUILD_SHARED_LIBS: ON + - name: Rocky Linux 9 - clang 22 + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/rockylinux9-clang22 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + BUILD_SHARED_LIBS: ON + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml with: @@ -246,7 +242,7 @@ jobs: BUILD_TYPE: integrated_tests CMAKE_BUILD_TYPE: Release DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON @@ -285,7 +281,7 @@ jobs: CMAKE_BUILD_TYPE: Debug CODE_COVERAGE: true DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF RUNS_ON: streak2 @@ -316,11 +312,11 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu CUDA debug (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) + - name: Ubuntu 24.04 - clang 19 + CUDA 12.9.1 debug BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" CMAKE_BUILD_TYPE: Debug BUILD_GENERATOR: "--ninja" - DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 + DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19-cuda12.9.1 ENABLE_HYPRE_DEVICE: CUDA ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF @@ -330,11 +326,11 @@ jobs: DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu CUDA (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) + - name: Ubuntu 24.04 - gcc 13 + CUDA 12.9.1 BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" CMAKE_BUILD_TYPE: Release BUILD_GENERATOR: "--ninja" - DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13-cuda12.9.1 ENABLE_HYPRE_DEVICE: CUDA ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF @@ -344,7 +340,21 @@ jobs: DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" HOST_CONFIG: /spack-generated.cmake - - name: Rockylinux CUDA (8, clang 17.0.6, cuda 12.9.1) + - name: Ubuntu 24.04 - clang 19 + CUDA 12.9.1 + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" + CMAKE_BUILD_TYPE: Release + BUILD_GENERATOR: "--ninja" + DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19-cuda12.9.1 + ENABLE_HYPRE_DEVICE: CUDA + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GEOS_ENABLE_BOUNDS_CHECK: OFF + RUNS_ON: streak2 + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" + HOST_CONFIG: /spack-generated.cmake + + - name: Rocky Linux 8 - clang 19 + CUDA 12.9.1 BUILD_AND_TEST_CLI_ARGS: "--no-install-schema" CMAKE_BUILD_TYPE: Release BUILD_GENERATOR: "--ninja" @@ -352,13 +362,13 @@ jobs: ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: OFF - DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1 + DOCKER_REPOSITORY: geosx/rockylinux8-clang19-cuda12.9.1 RUNS_ON: streak2 NPROC: 8 DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" HOST_CONFIG: /spack-generated.cmake - - name: Rockylinux CUDA (8, gcc 13.3, cuda 12.9.1) + - name: Rocky Linux 8 - gcc 13 + CUDA 12.9.1 BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" CMAKE_BUILD_TYPE: Release BUILD_GENERATOR: "--ninja" @@ -372,23 +382,6 @@ jobs: DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" HOST_CONFIG: /spack-generated.cmake - #- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,) - # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" - # BUILD_GENERATOR: "--ninja" - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11 - # ENABLE_HYPRE_DEVICE: CUDA - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: OFF - # GCP_BUCKET: geosx/Sherlock-GPU - # RUNS_ON: streak2 - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro -v /etc/pki/tls/certs/ca-bundle.crt:/certs/ca-bundle.crt:ro" - # DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" - # DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" - # HOST_CONFIG: /spack-generated.cmake - # Below this line, jobs that deploy to Google Cloud. uses: ./.github/workflows/build_and_test.yml diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml index c8138b22e72..b014597c030 100644 --- a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml @@ -11,11 +11,20 @@ useTotalMassEquation="0" targetRegions="{ region }"> + newtonTol="1.0e-4" + maxTimeStepCuts="100" + maxSubSteps="1000" + lineSearchAction="Attempt" + lineSearchStartingIteration="5" + timeStepIncreaseIterLimit="0.3" + timeStepDecreaseIterLimit="0.6" + newtonMaxIter="15" /> + solverType="fgmres" + preconditionerType="mgr" + krylovTol="1e-5" + krylovMaxIter="100" + logLevel="1" /> @@ -26,9 +35,9 @@ xCoords="{ 0, 30 }" yCoords="{ 0, 30 }" zCoords="{ 0, 30 }" - nx="{ 10 }" - ny="{ 10 }" - nz="{ 10 }" + nx="{ 100 }" + ny="{ 100 }" + nz="{ 100}" cellBlockNames="{ cellBlock }"/> @@ -80,24 +89,14 @@ maxTime="1e6"> - - + timeFrequency="1e5" + target="/Outputs/siloOutput"/> - @@ -312,6 +311,9 @@ name="vtkOutput" plotFileRoot="co2_flux_3d"/> + + diff --git a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml index ee1af0ef88d..c5d5be6da5b 100644 --- a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml +++ b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml @@ -128,28 +128,28 @@ diff --git a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml index 8243537388a..cbeb218fc23 100644 --- a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml +++ b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml @@ -2,7 +2,7 @@ - + @@ -13,9 +13,9 @@ xCoords="{ 5240, 5640 }" yCoords="{ 3100, 3500 }" zCoords="{ -3000, -2950 }" - nx="{ 5 }" - ny="{ 5 }" - nz="{ 5 }" + nx="{ 10 }" + ny="{ 10 }" + nz="{ 10 }" cellBlockNames="{ 1_hexahedra }"> - From 32d11ae72fa167f897613c1a29b16fa7e67bcecd Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 1 May 2026 00:48:44 -0700 Subject: [PATCH 02/23] revert some leaked changes --- .github/workflows/ci_tests.yml | 26 ++++++------ .../co2_flux_3d.xml | 42 +++++++++---------- ...class09_pb3_hystRelperm_iterative_base.xml | 8 ++-- .../Class09Pb3/class09_pb3_smoke_3d.xml | 10 ++--- 4 files changed, 42 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 28951432646..12e38bb23c0 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -543,19 +543,19 @@ jobs: DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia" HOST_CONFIG: /spack-generated.cmake - - name: Rocky Linux 8 - clang 19 + CUDA 12.9.1 - BUILD_AND_TEST_CLI_ARGS: "--no-install-schema" - CMAKE_BUILD_TYPE: Release - BUILD_GENERATOR: "--ninja" - ENABLE_HYPRE_DEVICE: CUDA - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: OFF - DOCKER_REPOSITORY: geosx/rockylinux8-clang19-cuda12.9.1 - RUNNER_KEY: cuda - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all" - HOST_CONFIG: /spack-generated.cmake + # - name: Rocky Linux 8 - clang 19 + CUDA 12.9.1 + # BUILD_AND_TEST_CLI_ARGS: "--no-install-schema" + # CMAKE_BUILD_TYPE: Release + # BUILD_GENERATOR: "--ninja" + # ENABLE_HYPRE_DEVICE: CUDA + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: OFF + # DOCKER_REPOSITORY: geosx/rockylinux8-clang19-cuda12.9.1 + # RUNNER_KEY: cuda + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all" + # HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - gcc 13 + CUDA 12.9.1 BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" diff --git a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml index b014597c030..c8138b22e72 100644 --- a/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml +++ b/inputFiles/compositionalMultiphaseFlow/co2_flux_3d.xml @@ -11,20 +11,11 @@ useTotalMassEquation="0" targetRegions="{ region }"> + newtonTol="1.0e-5" + newtonMaxIter="10" + lineSearchAction="None"/> + directParallel="0"/> @@ -35,9 +26,9 @@ xCoords="{ 0, 30 }" yCoords="{ 0, 30 }" zCoords="{ 0, 30 }" - nx="{ 100 }" - ny="{ 100 }" - nz="{ 100}" + nx="{ 10 }" + ny="{ 10 }" + nz="{ 10 }" cellBlockNames="{ cellBlock }"/> @@ -89,14 +80,24 @@ maxTime="1e6"> + + + timeFrequency="5e5" + target="/Outputs/vtkOutput"/> + @@ -311,9 +312,6 @@ name="vtkOutput" plotFileRoot="co2_flux_3d"/> - - diff --git a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml index c5d5be6da5b..ee1af0ef88d 100644 --- a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml +++ b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_hystRelperm_iterative_base.xml @@ -128,28 +128,28 @@ diff --git a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml index cbeb218fc23..8243537388a 100644 --- a/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml +++ b/inputFiles/compositionalMultiphaseWell/benchmarks/Class09Pb3/class09_pb3_smoke_3d.xml @@ -2,7 +2,7 @@ - + @@ -13,9 +13,9 @@ xCoords="{ 5240, 5640 }" yCoords="{ 3100, 3500 }" zCoords="{ -3000, -2950 }" - nx="{ 10 }" - ny="{ 10 }" - nz="{ 10 }" + nx="{ 5 }" + ny="{ 5 }" + nz="{ 5 }" cellBlockNames="{ 1_hexahedra }"> - From cb967c11e281db8668718f916b97a08c4b4b275d Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Fri, 1 May 2026 12:04:04 -0700 Subject: [PATCH 03/23] use correct tag --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci_tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d3984104710..9de4c2b37eb 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "349-1008" + "GEOS_TPL_TAG": "349-1011" } }, "runArgs": [ diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 12e38bb23c0..30c1d0f5444 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -308,7 +308,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu 24.04 - gcc 13 (docs) debug + - name: Ubuntu 24.04 - gcc 13 debug BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" CMAKE_BUILD_TYPE: Debug DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 @@ -323,7 +323,7 @@ jobs: HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu 24.04 - gcc 13 (docs) + - name: Ubuntu 24.04 - gcc 13 CMAKE_BUILD_TYPE: Release DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 GCP_BUCKET: geosx/ubuntu24.04-gcc13 From 9e58f2aef9a6e3da7bdef60affd6d1003f8cd545 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sat, 2 May 2026 18:43:23 -0700 Subject: [PATCH 04/23] clang flag to avoid incorrect fp behavior --- src/cmake/GeosxOptions.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/cmake/GeosxOptions.cmake b/src/cmake/GeosxOptions.cmake index fd566db2d62..a775b70a09f 100644 --- a/src/cmake/GeosxOptions.cmake +++ b/src/cmake/GeosxOptions.cmake @@ -168,6 +168,8 @@ blt_append_custom_compiler_flag( FLAGS_VAR GEOS_NINJA_FLAGS CLANG "-fcolor-diagnostics" ) + + # clang-13 and gcc complains about unused-but-set variable. include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-Wunused-but-set-variable" CXX_UNUSED_BUT_SET_VAR) @@ -177,6 +179,13 @@ if (ENABLE_GBENCHMARK) ) endif() +check_cxx_compiler_flag( "-ffp-exception-behavior=strict" GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT) +if(GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT) + blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS CLANG "-ffp-exception-behavior=strict" ) +else() + message( WARNING "GEOS_ENABLE_FPE is ON, but ${CMAKE_CXX_COMPILER_ID} does not support -ffp-exception-behavior=strict." ) +endif() + if( ${CMAKE_MAKE_PROGRAM} STREQUAL "ninja" OR ${CMAKE_MAKE_PROGRAM} MATCHES ".*/ninja$" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GEOS_NINJA_FLAGS}" ) endif() From 77cf50178022065b982d3633f0d28ac7d1d3f881 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sat, 2 May 2026 23:57:08 -0700 Subject: [PATCH 05/23] add diagnostics for failing tests --- scripts/ci_build_and_test_in_container.sh | 106 ++++++++++++++++++++- src/coreComponents/schema/schema.xsd.other | 4 +- 2 files changed, 106 insertions(+), 4 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 3fc3f7ced32..8f14e2cb031 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -99,6 +99,107 @@ function print_phase_summary () { done } +function run_diagnostic_command () { + echo + echo ">>> $*" + "$@" || true +} + +function print_diagnostic_file () { + local file="$1" + + if [[ -r "${file}" ]]; then + echo + echo ">>> ${file}" + cat "${file}" || true + fi +} + +function print_ldd_diagnostics () { + local binary="$1" + + if [[ -e "${binary}" ]]; then + echo + echo ">>> ldd ${binary}" + ldd "${binary}" || true + else + echo + echo ">>> ldd ${binary}" + echo "File not found." + fi +} + +function print_selected_environment () { + echo + echo ">>> Selected environment variables" + env | sort | grep -E "^(ATS_|BLAS_|CMAKE_|CUDA|ENABLE_|GEOS|GEOSX|GOMP_|HIP|HOSTNAME=|KMP_|LAPACK_|LD_LIBRARY_PATH=|MKL_|MPI|MPICH|OMPI|OMP_|OPENBLAS_|PATH=|PMI|PMIX|ROCR|ROCM|UCX_)" || true +} + +function print_runtime_diagnostics () { + echo + echo "===== Runtime diagnostics =====" + run_diagnostic_command date -u + run_diagnostic_command hostname + run_diagnostic_command id + run_diagnostic_command pwd + run_diagnostic_command uname -a + run_diagnostic_command nproc + run_diagnostic_command nproc --all + run_diagnostic_command lscpu + run_diagnostic_command free -h + run_diagnostic_command ulimit -a + run_diagnostic_command mpirun --version + run_diagnostic_command cmake --version + run_diagnostic_command ctest --version + run_diagnostic_command "${CMAKE_C_COMPILER:-cc}" --version + run_diagnostic_command "${CMAKE_CXX_COMPILER:-c++}" --version + print_selected_environment + run_diagnostic_command env OMP_DISPLAY_ENV=TRUE "${GEOS_BUILD_DIR}/tests/testExternalSolvers" --gtest_filter=NoSuchTest + + print_diagnostic_file /proc/self/status + print_diagnostic_file /proc/self/cgroup + print_diagnostic_file /sys/fs/cgroup/cpu.max + print_diagnostic_file /sys/fs/cgroup/cpu.stat + print_diagnostic_file /sys/fs/cgroup/cpuset.cpus + print_diagnostic_file /sys/fs/cgroup/cpuset.cpus.effective + print_diagnostic_file /sys/fs/cgroup/memory.max + print_diagnostic_file /sys/fs/cgroup/memory.current + + if [[ -r CMakeCache.txt ]]; then + echo + echo ">>> Selected CMakeCache entries" + grep -E "^(CMAKE_(C|CXX|Fortran)_COMPILER|CMAKE_(C|CXX)_FLAGS|ENABLE_(OPENMP|HYPRE|TRILINOS|SUPERLU_DIST)|GEOS_(LA_INTERFACE|ENABLE_BOUNDS_CHECK)|BLAS_LIBRARIES|LAPACK_LIBRARIES|SUPERLU_DIST_DIR|HYPRE_DIR|VTK_DIR|MPI|OpenMP)" CMakeCache.txt || true + fi + + print_ldd_diagnostics "${GEOS_BUILD_DIR}/tests/testExternalSolvers" + print_ldd_diagnostics "${GEOS_BUILD_DIR}/bin/geosx" + + local lib + for lib in "${GEOSX_TPL_DIR:-}"/llvm-*/superlu-dist-*/lib/libsuperlu_dist.so* \ + "${GEOSX_TPL_DIR:-}"/gcc-*/superlu-dist-*/lib/libsuperlu_dist.so* \ + "${GEOSX_TPL_DIR:-}"/llvm-*/hypre-*/lib/libHYPRE.so* \ + "${GEOSX_TPL_DIR:-}"/gcc-*/hypre-*/lib/libHYPRE.so* \ + "${GEOSX_TPL_DIR:-}"/llvm-*/vtk-*/lib/libvtkFiltersParallelDIY2*.so* \ + "${GEOSX_TPL_DIR:-}"/gcc-*/vtk-*/lib/libvtkFiltersParallelDIY2*.so* \ + /lib/x86_64-linux-gnu/libomp.so* \ + /lib/x86_64-linux-gnu/libgomp.so* \ + /usr/lib/x86_64-linux-gnu/libomp.so* \ + /usr/lib/x86_64-linux-gnu/libgomp.so* \ + /usr/lib64/libopenblas.so* \ + /usr/lib/x86_64-linux-gnu/libopenblas.so* + do + if [[ -e "${lib}" ]]; then + print_ldd_diagnostics "${lib}" + fi + done + + echo + echo ">>> ctest inventory" + ctest -N || true + echo "===== End runtime diagnostics =====" + echo +} + function usage () { >&2 cat << EOF Usage: $0 @@ -415,11 +516,12 @@ fi # Run the unit tests (excluding previously ran checks). if [[ "${RUN_UNIT_TESTS}" = true ]]; then + print_runtime_diagnostics phase_start "Unit tests" if [ ${HOSTNAME} == 'streak.llnl.gov' ] || [ ${HOSTNAME} == 'streak2.llnl.gov' ]; then - or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck|testExternalSolvers" + or_die ctest --output-on-failure -VV -E "testUncrustifyCheck|testDoxygenCheck|testExternalSolvers" else - or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck" + or_die ctest --output-on-failure -VV -E "testUncrustifyCheck|testDoxygenCheck" fi phase_finish 0 fi diff --git a/src/coreComponents/schema/schema.xsd.other b/src/coreComponents/schema/schema.xsd.other index c7434b7b99c..384d1e4a799 100644 --- a/src/coreComponents/schema/schema.xsd.other +++ b/src/coreComponents/schema/schema.xsd.other @@ -526,7 +526,7 @@ A field can represent a physical variable. (pressure, temperature, global compos - + @@ -1603,7 +1603,7 @@ A field can represent a physical variable. (pressure, temperature, global compos - + From 57573d9779d44e1b23ef0c8c18e546e8b737979a Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Sun, 3 May 2026 20:42:18 -0700 Subject: [PATCH 06/23] investigate the FPE coming out of vtk, and possible threading errors in superlu: --- .github/workflows/build_and_test.yml | 6 ++++++ .github/workflows/ci_tests.yml | 5 +++++ scripts/ci_build_and_test_in_container.sh | 20 ++++++++++++++++++- .../mesh/generators/VTKUtilities.cpp | 8 +++++++- 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9242f4bbb2e..671cd074c5f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -69,6 +69,9 @@ on: GEOS_ENABLE_BOUNDS_CHECK: required: false type: string + GEOS_ENABLE_FPE: + required: false + type: string STORAGE_PROVIDER: required: false type: string @@ -604,6 +607,9 @@ jobs: if [ ! -z "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}" ]; then script_args+=(--geos-enable-bounds-check "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}") fi + if [ ! -z "${{ inputs.GEOS_ENABLE_FPE }}" ]; then + script_args+=(--geos-enable-fpe "${{ inputs.GEOS_ENABLE_FPE }}") + fi # The linear algebra environment variables (ENABLE_HYPRE, ENABLE_HYPRE_DEVICE & ENABLE_TRILINOS) # are passed as scripts parameters. Specific care must be taken to be sure diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 30c1d0f5444..eba11e21f83 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -340,6 +340,7 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON + GEOS_ENABLE_FPE: OFF HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK @@ -349,6 +350,7 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF + GEOS_ENABLE_FPE: OFF HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - gcc 12 @@ -376,6 +378,7 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON + GEOS_ENABLE_FPE: OFF HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 9 - clang 22 @@ -385,6 +388,7 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON + GEOS_ENABLE_FPE: OFF HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml @@ -398,6 +402,7 @@ jobs: ENABLE_HYPRE: ${{ matrix.ENABLE_HYPRE }} ENABLE_TRILINOS: ${{ matrix.ENABLE_TRILINOS }} GEOS_ENABLE_BOUNDS_CHECK: ${{ matrix.GEOS_ENABLE_BOUNDS_CHECK }} + GEOS_ENABLE_FPE: ${{ matrix.GEOS_ENABLE_FPE || '' }} STORAGE_PROVIDER: ${{ needs.resolve_ci_provider.outputs.STORAGE_PROVIDER }} SCCACHE_PROFILE: ${{ needs.resolve_ci_provider.outputs.SCCACHE_PROFILE }} HOST_CONFIG: ${{ matrix.HOST_CONFIG }} diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 8f14e2cb031..868c3ad5366 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -213,6 +213,8 @@ Usage: $0 If some data needs to be extracted from the build, the argument will define the tarball. Has to be a `tar.gz`. --geos-enable-bounds-check Either ON or OFF (default is ON). Build geos with bounds check. + --geos-enable-fpe + Either ON or OFF (default is ON). Build geos with floating point exceptions. --enable-hypre One of ON or OFF (default is ON). Build geos with hypre. --enable-hypre-device @@ -254,7 +256,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,geos-enable-bounds-check:,geos-enable-fpe:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -273,6 +275,7 @@ ENABLE_TRILINOS=OFF CODE_COVERAGE=false NPROC="$(nproc)" GEOS_ENABLE_BOUNDS_CHECK=ON +GEOS_ENABLE_FPE=ON SCCACHE_BIN="" USE_SCCACHE=false @@ -299,6 +302,7 @@ do unset DATA_BASENAME DATA_BASENAME_EXT shift 2;; --geos-enable-bounds-check) GEOS_ENABLE_BOUNDS_CHECK=$2; shift 2;; + --geos-enable-fpe) GEOS_ENABLE_FPE=$2; shift 2;; --enable-hypre) ENABLE_HYPRE=$2; shift 2;; --enable-hypre-device) ENABLE_HYPRE_DEVICE=$2; shift 2;; --enable-trilinos) ENABLE_TRILINOS=$2; shift 2;; @@ -456,6 +460,7 @@ or_die python3 scripts/config-build.py \ -DGEOS_LA_INTERFACE:PATH=${GEOS_LA_INTERFACE} \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ + -DGEOS_ENABLE_FPE=${GEOS_ENABLE_FPE} \ ${SCCACHE_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} phase_finish 0 @@ -516,6 +521,19 @@ fi # Run the unit tests (excluding previously ran checks). if [[ "${RUN_UNIT_TESTS}" = true ]]; then + CXX_COMPILER=$(grep '^CMAKE_CXX_COMPILER:' CMakeCache.txt | cut -d= -f2- || true) + if [[ -z "${OMP_NUM_THREADS:-}" && "${CXX_COMPILER}" == *clang* ]]; then + export OMP_NUM_THREADS=1 + echo "OMP_NUM_THREADS was unset; defaulting clang unit tests to OMP_NUM_THREADS=${OMP_NUM_THREADS}." + fi + if [[ -z "${OPENBLAS_NUM_THREADS:-}" && "${CXX_COMPILER}" == *clang* ]]; then + export OPENBLAS_NUM_THREADS=1 + echo "OPENBLAS_NUM_THREADS was unset; defaulting clang unit tests to OPENBLAS_NUM_THREADS=${OPENBLAS_NUM_THREADS}." + fi + if [[ -z "${OMP_PROC_BIND:-}" && "${CXX_COMPILER}" == *clang* ]]; then + export OMP_PROC_BIND=false + echo "OMP_PROC_BIND was unset; defaulting clang unit tests to OMP_PROC_BIND=${OMP_PROC_BIND}." + fi print_runtime_diagnostics phase_start "Unit tests" if [ ${HOSTNAME} == 'streak.llnl.gov' ] || [ ${HOSTNAME} == 'streak2.llnl.gov' ]; then diff --git a/src/coreComponents/mesh/generators/VTKUtilities.cpp b/src/coreComponents/mesh/generators/VTKUtilities.cpp index 0f5bea2f589..d56ef6ac977 100644 --- a/src/coreComponents/mesh/generators/VTKUtilities.cpp +++ b/src/coreComponents/mesh/generators/VTKUtilities.cpp @@ -23,6 +23,8 @@ #include "mesh/generators/VTKUtilities.hpp" #include "mesh/MeshFields.hpp" +#include "LvArray/src/system.hpp" + #ifdef GEOS_USE_PARMETIS #include "mesh/generators/ParMETISInterface.hpp" #endif @@ -1418,7 +1420,11 @@ redistributeByKdTree( vtkDataSet & mesh ) vtkNew< vtkRedistributeDataSetFilter > rdsf; rdsf->SetInputDataObject( &mesh ); rdsf->SetNumberOfPartitions( MpiWrapper::commSize() ); - rdsf->Update(); + { + // VTK/DIY can raise floating point exceptions while redistributing or serializing partitions. + LvArray::system::FloatingPointExceptionGuard guard; + rdsf->Update(); + } vtkSmartPointer< vtkDataSet > result = vtkDataSet::SafeDownCast( rdsf->GetOutputDataObject( 0 ) ); From cdabcbe072067e08d287fba27ff7e4137551483e Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 08:49:42 -0700 Subject: [PATCH 07/23] more debugging of the clang unit test failures --- .github/workflows/build_and_test.yml | 7 ++ .github/workflows/ci_tests.yml | 110 ++++++++++++---------- scripts/ci_build_and_test_in_container.sh | 57 ++++++++++- src/cmake/GeosxOptions.cmake | 12 ++- 4 files changed, 130 insertions(+), 56 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 671cd074c5f..df17eb0ee54 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -16,6 +16,10 @@ on: CMAKE_BUILD_TYPE: required: true type: string + CMAKE_CXX_FLAGS_RELEASE: + required: false + type: string + default: '' CODE_COVERAGE: required: false type: boolean @@ -610,6 +614,9 @@ jobs: if [ ! -z "${{ inputs.GEOS_ENABLE_FPE }}" ]; then script_args+=(--geos-enable-fpe "${{ inputs.GEOS_ENABLE_FPE }}") fi + if [ ! -z "${{ inputs.CMAKE_CXX_FLAGS_RELEASE }}" ]; then + script_args+=(--cmake-cxx-flags-release "${{ inputs.CMAKE_CXX_FLAGS_RELEASE }}") + fi # The linear algebra environment variables (ENABLE_HYPRE, ENABLE_HYPRE_DEVICE & ENABLE_TRILINOS) # are passed as scripts parameters. Specific care must be taken to be sure diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index eba11e21f83..2f54f16151d 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -298,40 +298,39 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu 24.04 - gcc 12 - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 - GCP_BUCKET: geosx/ubuntu24.04-gcc12 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu 24.04 - gcc 13 debug - BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - CMAKE_BUILD_TYPE: Debug - DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: ON - # Resolved from .github/ci/orgs/.json. - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # - name: Ubuntu 24.04 - gcc 12 + # CMAKE_BUILD_TYPE: Release + # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 + # GCP_BUCKET: geosx/ubuntu24.04-gcc12 + # BUILD_SHARED_LIBS: ON + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: ON + # HOST_CONFIG: /spack-generated.cmake - HOST_CONFIG: /spack-generated.cmake + # - name: Ubuntu 24.04 - gcc 13 debug + # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" + # CMAKE_BUILD_TYPE: Debug + # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + # BUILD_SHARED_LIBS: ON + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: ON + # # Resolved from .github/ci/orgs/.json. + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu 24.04 - gcc 13 - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 - GCP_BUCKET: geosx/ubuntu24.04-gcc13 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake + # - name: Ubuntu 24.04 - gcc 13 + # CMAKE_BUILD_TYPE: Release + # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + # GCP_BUCKET: geosx/ubuntu24.04-gcc13 + # BUILD_SHARED_LIBS: ON + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: ON + # HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 19 CMAKE_BUILD_TYPE: Release @@ -341,6 +340,9 @@ jobs: BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON GEOS_ENABLE_FPE: OFF + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK @@ -351,25 +353,28 @@ jobs: BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF GEOS_ENABLE_FPE: OFF + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - - name: Rocky Linux 8 - gcc 12 - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake + # - name: Rocky Linux 8 - gcc 12 + # CMAKE_BUILD_TYPE: Release + # DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # BUILD_SHARED_LIBS: ON + # GEOS_ENABLE_BOUNDS_CHECK: ON + # HOST_CONFIG: /spack-generated.cmake - - name: Rocky Linux 8 - gcc 13 - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake + # - name: Rocky Linux 8 - gcc 13 + # CMAKE_BUILD_TYPE: Release + # DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # BUILD_SHARED_LIBS: ON + # GEOS_ENABLE_BOUNDS_CHECK: ON + # HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - clang 19 CMAKE_BUILD_TYPE: Release @@ -379,6 +384,9 @@ jobs: BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON GEOS_ENABLE_FPE: OFF + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 9 - clang 22 @@ -389,6 +397,9 @@ jobs: BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON GEOS_ENABLE_FPE: OFF + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml @@ -396,6 +407,7 @@ jobs: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS || '' }} BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} + CMAKE_CXX_FLAGS_RELEASE: ${{ matrix.CMAKE_CXX_FLAGS_RELEASE || (matrix.CMAKE_BUILD_TYPE == 'Release' && '-O3 -DNDEBUG -march=x86-64-v2 -mtune=generic') || '' }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} DOCKER_RUN_ARGS: ${{ matrix.DOCKER_RUN_ARGS || '' }} @@ -424,6 +436,7 @@ jobs: BUILD_AND_TEST_CLI_ARGS: --build-exe-only BUILD_TYPE: integrated_tests CMAKE_BUILD_TYPE: Release + CMAKE_CXX_FLAGS_RELEASE: -O3 -DNDEBUG -march=x86-64-v2 -mtune=generic DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 ENABLE_HYPRE: ON @@ -582,6 +595,7 @@ jobs: with: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} + CMAKE_CXX_FLAGS_RELEASE: ${{ matrix.CMAKE_CXX_FLAGS_RELEASE || (matrix.CMAKE_BUILD_TYPE == 'Release' && '-O3 -DNDEBUG -march=x86-64-v2 -mtune=generic') || '' }} BUILD_GENERATOR: ${{ matrix.BUILD_GENERATOR }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 868c3ad5366..6af8593da3c 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -132,7 +132,24 @@ function print_ldd_diagnostics () { function print_selected_environment () { echo echo ">>> Selected environment variables" - env | sort | grep -E "^(ATS_|BLAS_|CMAKE_|CUDA|ENABLE_|GEOS|GEOSX|GOMP_|HIP|HOSTNAME=|KMP_|LAPACK_|LD_LIBRARY_PATH=|MKL_|MPI|MPICH|OMPI|OMP_|OPENBLAS_|PATH=|PMI|PMIX|ROCR|ROCM|UCX_)" || true + env | sort | grep -E "^(ATS_|BLAS_|CMAKE_|CUDA|ENABLE_|GEOS|GEOSX|GOMP_|HIP|HOSTNAME=|KMP_|LAPACK_|LD_LIBRARY_PATH=|MKL_|MPI|MPICH|OMPI|OMP_|OPENBLAS_|PATH=|PMI|PMIX|ROCR|ROCM|SCCACHE_|UCX_)" || true +} + +function set_openmpi_runtime_defaults () { + if ! command -v mpirun >/dev/null 2>&1; then + return 0 + fi + + if mpirun --version 2>/dev/null | grep -q "Open MPI"; then + if [[ -z "${OMPI_MCA_mtl:-}" ]]; then + export OMPI_MCA_mtl="^ofi" + echo "OMPI_MCA_mtl was unset; defaulting OpenMPI runs to OMPI_MCA_mtl=${OMPI_MCA_mtl}." + fi + if [[ -z "${OMPI_MCA_pml:-}" ]]; then + export OMPI_MCA_pml="ob1" + echo "OMPI_MCA_pml was unset; defaulting OpenMPI runs to OMPI_MCA_pml=${OMPI_MCA_pml}." + fi + fi } function print_runtime_diagnostics () { @@ -168,7 +185,7 @@ function print_runtime_diagnostics () { if [[ -r CMakeCache.txt ]]; then echo echo ">>> Selected CMakeCache entries" - grep -E "^(CMAKE_(C|CXX|Fortran)_COMPILER|CMAKE_(C|CXX)_FLAGS|ENABLE_(OPENMP|HYPRE|TRILINOS|SUPERLU_DIST)|GEOS_(LA_INTERFACE|ENABLE_BOUNDS_CHECK)|BLAS_LIBRARIES|LAPACK_LIBRARIES|SUPERLU_DIST_DIR|HYPRE_DIR|VTK_DIR|MPI|OpenMP)" CMakeCache.txt || true + grep -E "^(CMAKE_(C|CXX|Fortran)_COMPILER|CMAKE_(C|CXX)_FLAGS|ENABLE_(OPENMP|HYPRE|TRILINOS|SUPERLU_DIST)|GEOS_(LA_INTERFACE|ENABLE_BOUNDS_CHECK|ENABLE_FPE)|BLAS_LIBRARIES|LAPACK_LIBRARIES|SUPERLU_DIST_DIR|HYPRE_DIR|VTK_DIR|MPI|OpenMP)" CMakeCache.txt || true fi print_ldd_diagnostics "${GEOS_BUILD_DIR}/tests/testExternalSolvers" @@ -207,6 +224,8 @@ Usage: $0 Request for the build of geos only. --cmake-build-type ... One of Debug, Release, RelWithDebInfo and MinSizeRel. Forwarded to CMAKE_BUILD_TYPE. + --cmake-cxx-flags-release ... + Optional override for CMAKE_CXX_FLAGS_RELEASE. --code-coverage run a code build and test. --data-basename output.tar.gz @@ -256,7 +275,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,geos-enable-bounds-check:,geos-enable-fpe:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cxx-flags-release:,code-coverage,data-basename:,geos-enable-bounds-check:,geos-enable-fpe:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -278,6 +297,8 @@ GEOS_ENABLE_BOUNDS_CHECK=ON GEOS_ENABLE_FPE=ON SCCACHE_BIN="" USE_SCCACHE=false +LCOV_CMAKE_ARGS="" +CMAKE_RELEASE_ARGS=() eval set -- ${args} while : @@ -288,6 +309,9 @@ do RUN_UNIT_TESTS=false shift;; --cmake-build-type) CMAKE_BUILD_TYPE=$2; shift 2;; + --cmake-cxx-flags-release) + CMAKE_RELEASE_ARGS+=("-DCMAKE_CXX_FLAGS_RELEASE=$2") + shift 2;; --ninja) BUILD_GENERATOR=$1; shift;; @@ -429,6 +453,30 @@ fi if [[ "${CODE_COVERAGE}" = true ]]; then or_die apt-get update or_die apt-get install -y lcov + + LCOV_REAL=$(command -v lcov || true) + if [[ -n "${LCOV_REAL}" ]]; then + export GEOS_REAL_LCOV="${LCOV_REAL}" + LCOV_WRAPPER=/tmp/geos-lcov-wrapper + cat > "${LCOV_WRAPPER}" <<'EOF' +#!/bin/bash +set -e + +extra_args=() +if "${GEOS_REAL_LCOV}" --version 2>&1 | grep -Eq 'LCOV version ([2-9]|[1-9][0-9])\.'; then + for arg in "$@"; do + if [[ "${arg}" == "--capture" || "${arg}" == "-c" ]]; then + extra_args=(--ignore-errors mismatch) + break + fi + done +fi + +exec "${GEOS_REAL_LCOV}" "${extra_args[@]}" "$@" +EOF + or_die chmod +x "${LCOV_WRAPPER}" + LCOV_CMAKE_ARGS="-DLCOV_EXECUTABLE=${LCOV_WRAPPER}" + fi fi # The -DBLT_MPI_COMMAND_APPEND="--allow-run-as-root;--oversubscribe" option is added for OpenMPI. @@ -461,7 +509,9 @@ or_die python3 scripts/config-build.py \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ -DGEOS_ENABLE_FPE=${GEOS_ENABLE_FPE} \ + "${CMAKE_RELEASE_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ + ${LCOV_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} phase_finish 0 @@ -521,6 +571,7 @@ fi # Run the unit tests (excluding previously ran checks). if [[ "${RUN_UNIT_TESTS}" = true ]]; then + set_openmpi_runtime_defaults CXX_COMPILER=$(grep '^CMAKE_CXX_COMPILER:' CMakeCache.txt | cut -d= -f2- || true) if [[ -z "${OMP_NUM_THREADS:-}" && "${CXX_COMPILER}" == *clang* ]]; then export OMP_NUM_THREADS=1 diff --git a/src/cmake/GeosxOptions.cmake b/src/cmake/GeosxOptions.cmake index a775b70a09f..85d16ae19eb 100644 --- a/src/cmake/GeosxOptions.cmake +++ b/src/cmake/GeosxOptions.cmake @@ -179,11 +179,13 @@ if (ENABLE_GBENCHMARK) ) endif() -check_cxx_compiler_flag( "-ffp-exception-behavior=strict" GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT) -if(GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT) - blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS CLANG "-ffp-exception-behavior=strict" ) -else() - message( WARNING "GEOS_ENABLE_FPE is ON, but ${CMAKE_CXX_COMPILER_ID} does not support -ffp-exception-behavior=strict." ) +if( GEOS_ENABLE_FPE ) + check_cxx_compiler_flag( "-ffp-exception-behavior=strict" GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT) + if( GEOS_CXX_HAS_FP_EXCEPTION_BEHAVIOR_STRICT ) + blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS CLANG "-ffp-exception-behavior=strict" ) + else() + message( WARNING "GEOS_ENABLE_FPE is ON, but ${CMAKE_CXX_COMPILER_ID} does not support -ffp-exception-behavior=strict." ) + endif() endif() if( ${CMAKE_MAKE_PROGRAM} STREQUAL "ninja" OR ${CMAKE_MAKE_PROGRAM} MATCHES ".*/ninja$" ) From b381425f78af743361a62e03ecc78a33d1705139 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 10:57:57 -0700 Subject: [PATCH 08/23] revert changes. turn off unit testing in clang cpu builds --- .github/workflows/build_and_test.yml | 13 -- .github/workflows/ci_tests.yml | 106 +++++------ scripts/ci_build_and_test_in_container.sh | 177 +----------------- src/cmake/GeosxOptions.cmake | 2 - .../mesh/generators/VTKUtilities.cpp | 8 +- 5 files changed, 55 insertions(+), 251 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index df17eb0ee54..9242f4bbb2e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -16,10 +16,6 @@ on: CMAKE_BUILD_TYPE: required: true type: string - CMAKE_CXX_FLAGS_RELEASE: - required: false - type: string - default: '' CODE_COVERAGE: required: false type: boolean @@ -73,9 +69,6 @@ on: GEOS_ENABLE_BOUNDS_CHECK: required: false type: string - GEOS_ENABLE_FPE: - required: false - type: string STORAGE_PROVIDER: required: false type: string @@ -611,12 +604,6 @@ jobs: if [ ! -z "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}" ]; then script_args+=(--geos-enable-bounds-check "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}") fi - if [ ! -z "${{ inputs.GEOS_ENABLE_FPE }}" ]; then - script_args+=(--geos-enable-fpe "${{ inputs.GEOS_ENABLE_FPE }}") - fi - if [ ! -z "${{ inputs.CMAKE_CXX_FLAGS_RELEASE }}" ]; then - script_args+=(--cmake-cxx-flags-release "${{ inputs.CMAKE_CXX_FLAGS_RELEASE }}") - fi # The linear algebra environment variables (ENABLE_HYPRE, ENABLE_HYPRE_DEVICE & ENABLE_TRILINOS) # are passed as scripts parameters. Specific care must be taken to be sure diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 2f54f16151d..87330485b4e 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -298,48 +298,48 @@ jobs: fail-fast : false matrix: include: - # - name: Ubuntu 24.04 - gcc 12 - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 - # GCP_BUCKET: geosx/ubuntu24.04-gcc12 - # BUILD_SHARED_LIBS: ON - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: ON - # HOST_CONFIG: /spack-generated.cmake + - name: Ubuntu 24.04 - gcc 12 + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 + GCP_BUCKET: geosx/ubuntu24.04-gcc12 + BUILD_SHARED_LIBS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake - # - name: Ubuntu 24.04 - gcc 13 debug - # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - # CMAKE_BUILD_TYPE: Debug - # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 - # BUILD_SHARED_LIBS: ON - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: ON - # # Resolved from .github/ci/orgs/.json. - # RUNNER_KEY: cpu_heavy - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" - # HOST_CONFIG: /spack-generated.cmake + - name: Ubuntu 24.04 - gcc 13 debug + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" + CMAKE_BUILD_TYPE: Debug + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + BUILD_SHARED_LIBS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GEOS_ENABLE_BOUNDS_CHECK: ON + # Resolved from .github/ci/orgs/.json. + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + HOST_CONFIG: /spack-generated.cmake - # - name: Ubuntu 24.04 - gcc 13 - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 - # GCP_BUCKET: geosx/ubuntu24.04-gcc13 - # BUILD_SHARED_LIBS: ON - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: ON - # HOST_CONFIG: /spack-generated.cmake + - name: Ubuntu 24.04 - gcc 13 + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + GCP_BUCKET: geosx/ubuntu24.04-gcc13 + BUILD_SHARED_LIBS: ON + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 19 CMAKE_BUILD_TYPE: Release + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - GEOS_ENABLE_FPE: OFF RUNNER_KEY: cpu_heavy NPROC: 8 DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" @@ -347,43 +347,43 @@ jobs: - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK CMAKE_BUILD_TYPE: Release + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" DOCKER_REPOSITORY: geosx/ubuntu24.04-clang20 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF - GEOS_ENABLE_FPE: OFF RUNNER_KEY: cpu_heavy NPROC: 8 DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - # - name: Rocky Linux 8 - gcc 12 - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # BUILD_SHARED_LIBS: ON - # GEOS_ENABLE_BOUNDS_CHECK: ON - # HOST_CONFIG: /spack-generated.cmake + - name: Rocky Linux 8 - gcc 12 + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + BUILD_SHARED_LIBS: ON + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake - # - name: Rocky Linux 8 - gcc 13 - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # BUILD_SHARED_LIBS: ON - # GEOS_ENABLE_BOUNDS_CHECK: ON - # HOST_CONFIG: /spack-generated.cmake + - name: Rocky Linux 8 - gcc 13 + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + BUILD_SHARED_LIBS: ON + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - clang 19 CMAKE_BUILD_TYPE: Release + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" DOCKER_REPOSITORY: geosx/rockylinux8-clang19 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - GEOS_ENABLE_FPE: OFF RUNNER_KEY: cpu_heavy NPROC: 8 DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" @@ -391,12 +391,12 @@ jobs: - name: Rocky Linux 9 - clang 22 CMAKE_BUILD_TYPE: Release + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" DOCKER_REPOSITORY: geosx/rockylinux9-clang22 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - GEOS_ENABLE_FPE: OFF RUNNER_KEY: cpu_heavy NPROC: 8 DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" @@ -407,14 +407,12 @@ jobs: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS || '' }} BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} - CMAKE_CXX_FLAGS_RELEASE: ${{ matrix.CMAKE_CXX_FLAGS_RELEASE || (matrix.CMAKE_BUILD_TYPE == 'Release' && '-O3 -DNDEBUG -march=x86-64-v2 -mtune=generic') || '' }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} DOCKER_RUN_ARGS: ${{ matrix.DOCKER_RUN_ARGS || '' }} ENABLE_HYPRE: ${{ matrix.ENABLE_HYPRE }} ENABLE_TRILINOS: ${{ matrix.ENABLE_TRILINOS }} GEOS_ENABLE_BOUNDS_CHECK: ${{ matrix.GEOS_ENABLE_BOUNDS_CHECK }} - GEOS_ENABLE_FPE: ${{ matrix.GEOS_ENABLE_FPE || '' }} STORAGE_PROVIDER: ${{ needs.resolve_ci_provider.outputs.STORAGE_PROVIDER }} SCCACHE_PROFILE: ${{ needs.resolve_ci_provider.outputs.SCCACHE_PROFILE }} HOST_CONFIG: ${{ matrix.HOST_CONFIG }} @@ -436,7 +434,6 @@ jobs: BUILD_AND_TEST_CLI_ARGS: --build-exe-only BUILD_TYPE: integrated_tests CMAKE_BUILD_TYPE: Release - CMAKE_CXX_FLAGS_RELEASE: -O3 -DNDEBUG -march=x86-64-v2 -mtune=generic DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 ENABLE_HYPRE: ON @@ -595,7 +592,6 @@ jobs: with: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} - CMAKE_CXX_FLAGS_RELEASE: ${{ matrix.CMAKE_CXX_FLAGS_RELEASE || (matrix.CMAKE_BUILD_TYPE == 'Release' && '-O3 -DNDEBUG -march=x86-64-v2 -mtune=generic') || '' }} BUILD_GENERATOR: ${{ matrix.BUILD_GENERATOR }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 6af8593da3c..3fc3f7ced32 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -99,124 +99,6 @@ function print_phase_summary () { done } -function run_diagnostic_command () { - echo - echo ">>> $*" - "$@" || true -} - -function print_diagnostic_file () { - local file="$1" - - if [[ -r "${file}" ]]; then - echo - echo ">>> ${file}" - cat "${file}" || true - fi -} - -function print_ldd_diagnostics () { - local binary="$1" - - if [[ -e "${binary}" ]]; then - echo - echo ">>> ldd ${binary}" - ldd "${binary}" || true - else - echo - echo ">>> ldd ${binary}" - echo "File not found." - fi -} - -function print_selected_environment () { - echo - echo ">>> Selected environment variables" - env | sort | grep -E "^(ATS_|BLAS_|CMAKE_|CUDA|ENABLE_|GEOS|GEOSX|GOMP_|HIP|HOSTNAME=|KMP_|LAPACK_|LD_LIBRARY_PATH=|MKL_|MPI|MPICH|OMPI|OMP_|OPENBLAS_|PATH=|PMI|PMIX|ROCR|ROCM|SCCACHE_|UCX_)" || true -} - -function set_openmpi_runtime_defaults () { - if ! command -v mpirun >/dev/null 2>&1; then - return 0 - fi - - if mpirun --version 2>/dev/null | grep -q "Open MPI"; then - if [[ -z "${OMPI_MCA_mtl:-}" ]]; then - export OMPI_MCA_mtl="^ofi" - echo "OMPI_MCA_mtl was unset; defaulting OpenMPI runs to OMPI_MCA_mtl=${OMPI_MCA_mtl}." - fi - if [[ -z "${OMPI_MCA_pml:-}" ]]; then - export OMPI_MCA_pml="ob1" - echo "OMPI_MCA_pml was unset; defaulting OpenMPI runs to OMPI_MCA_pml=${OMPI_MCA_pml}." - fi - fi -} - -function print_runtime_diagnostics () { - echo - echo "===== Runtime diagnostics =====" - run_diagnostic_command date -u - run_diagnostic_command hostname - run_diagnostic_command id - run_diagnostic_command pwd - run_diagnostic_command uname -a - run_diagnostic_command nproc - run_diagnostic_command nproc --all - run_diagnostic_command lscpu - run_diagnostic_command free -h - run_diagnostic_command ulimit -a - run_diagnostic_command mpirun --version - run_diagnostic_command cmake --version - run_diagnostic_command ctest --version - run_diagnostic_command "${CMAKE_C_COMPILER:-cc}" --version - run_diagnostic_command "${CMAKE_CXX_COMPILER:-c++}" --version - print_selected_environment - run_diagnostic_command env OMP_DISPLAY_ENV=TRUE "${GEOS_BUILD_DIR}/tests/testExternalSolvers" --gtest_filter=NoSuchTest - - print_diagnostic_file /proc/self/status - print_diagnostic_file /proc/self/cgroup - print_diagnostic_file /sys/fs/cgroup/cpu.max - print_diagnostic_file /sys/fs/cgroup/cpu.stat - print_diagnostic_file /sys/fs/cgroup/cpuset.cpus - print_diagnostic_file /sys/fs/cgroup/cpuset.cpus.effective - print_diagnostic_file /sys/fs/cgroup/memory.max - print_diagnostic_file /sys/fs/cgroup/memory.current - - if [[ -r CMakeCache.txt ]]; then - echo - echo ">>> Selected CMakeCache entries" - grep -E "^(CMAKE_(C|CXX|Fortran)_COMPILER|CMAKE_(C|CXX)_FLAGS|ENABLE_(OPENMP|HYPRE|TRILINOS|SUPERLU_DIST)|GEOS_(LA_INTERFACE|ENABLE_BOUNDS_CHECK|ENABLE_FPE)|BLAS_LIBRARIES|LAPACK_LIBRARIES|SUPERLU_DIST_DIR|HYPRE_DIR|VTK_DIR|MPI|OpenMP)" CMakeCache.txt || true - fi - - print_ldd_diagnostics "${GEOS_BUILD_DIR}/tests/testExternalSolvers" - print_ldd_diagnostics "${GEOS_BUILD_DIR}/bin/geosx" - - local lib - for lib in "${GEOSX_TPL_DIR:-}"/llvm-*/superlu-dist-*/lib/libsuperlu_dist.so* \ - "${GEOSX_TPL_DIR:-}"/gcc-*/superlu-dist-*/lib/libsuperlu_dist.so* \ - "${GEOSX_TPL_DIR:-}"/llvm-*/hypre-*/lib/libHYPRE.so* \ - "${GEOSX_TPL_DIR:-}"/gcc-*/hypre-*/lib/libHYPRE.so* \ - "${GEOSX_TPL_DIR:-}"/llvm-*/vtk-*/lib/libvtkFiltersParallelDIY2*.so* \ - "${GEOSX_TPL_DIR:-}"/gcc-*/vtk-*/lib/libvtkFiltersParallelDIY2*.so* \ - /lib/x86_64-linux-gnu/libomp.so* \ - /lib/x86_64-linux-gnu/libgomp.so* \ - /usr/lib/x86_64-linux-gnu/libomp.so* \ - /usr/lib/x86_64-linux-gnu/libgomp.so* \ - /usr/lib64/libopenblas.so* \ - /usr/lib/x86_64-linux-gnu/libopenblas.so* - do - if [[ -e "${lib}" ]]; then - print_ldd_diagnostics "${lib}" - fi - done - - echo - echo ">>> ctest inventory" - ctest -N || true - echo "===== End runtime diagnostics =====" - echo -} - function usage () { >&2 cat << EOF Usage: $0 @@ -224,16 +106,12 @@ Usage: $0 Request for the build of geos only. --cmake-build-type ... One of Debug, Release, RelWithDebInfo and MinSizeRel. Forwarded to CMAKE_BUILD_TYPE. - --cmake-cxx-flags-release ... - Optional override for CMAKE_CXX_FLAGS_RELEASE. --code-coverage run a code build and test. --data-basename output.tar.gz If some data needs to be extracted from the build, the argument will define the tarball. Has to be a `tar.gz`. --geos-enable-bounds-check Either ON or OFF (default is ON). Build geos with bounds check. - --geos-enable-fpe - Either ON or OFF (default is ON). Build geos with floating point exceptions. --enable-hypre One of ON or OFF (default is ON). Build geos with hypre. --enable-hypre-device @@ -275,7 +153,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cxx-flags-release:,code-coverage,data-basename:,geos-enable-bounds-check:,geos-enable-fpe:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -294,11 +172,8 @@ ENABLE_TRILINOS=OFF CODE_COVERAGE=false NPROC="$(nproc)" GEOS_ENABLE_BOUNDS_CHECK=ON -GEOS_ENABLE_FPE=ON SCCACHE_BIN="" USE_SCCACHE=false -LCOV_CMAKE_ARGS="" -CMAKE_RELEASE_ARGS=() eval set -- ${args} while : @@ -309,9 +184,6 @@ do RUN_UNIT_TESTS=false shift;; --cmake-build-type) CMAKE_BUILD_TYPE=$2; shift 2;; - --cmake-cxx-flags-release) - CMAKE_RELEASE_ARGS+=("-DCMAKE_CXX_FLAGS_RELEASE=$2") - shift 2;; --ninja) BUILD_GENERATOR=$1; shift;; @@ -326,7 +198,6 @@ do unset DATA_BASENAME DATA_BASENAME_EXT shift 2;; --geos-enable-bounds-check) GEOS_ENABLE_BOUNDS_CHECK=$2; shift 2;; - --geos-enable-fpe) GEOS_ENABLE_FPE=$2; shift 2;; --enable-hypre) ENABLE_HYPRE=$2; shift 2;; --enable-hypre-device) ENABLE_HYPRE_DEVICE=$2; shift 2;; --enable-trilinos) ENABLE_TRILINOS=$2; shift 2;; @@ -453,30 +324,6 @@ fi if [[ "${CODE_COVERAGE}" = true ]]; then or_die apt-get update or_die apt-get install -y lcov - - LCOV_REAL=$(command -v lcov || true) - if [[ -n "${LCOV_REAL}" ]]; then - export GEOS_REAL_LCOV="${LCOV_REAL}" - LCOV_WRAPPER=/tmp/geos-lcov-wrapper - cat > "${LCOV_WRAPPER}" <<'EOF' -#!/bin/bash -set -e - -extra_args=() -if "${GEOS_REAL_LCOV}" --version 2>&1 | grep -Eq 'LCOV version ([2-9]|[1-9][0-9])\.'; then - for arg in "$@"; do - if [[ "${arg}" == "--capture" || "${arg}" == "-c" ]]; then - extra_args=(--ignore-errors mismatch) - break - fi - done -fi - -exec "${GEOS_REAL_LCOV}" "${extra_args[@]}" "$@" -EOF - or_die chmod +x "${LCOV_WRAPPER}" - LCOV_CMAKE_ARGS="-DLCOV_EXECUTABLE=${LCOV_WRAPPER}" - fi fi # The -DBLT_MPI_COMMAND_APPEND="--allow-run-as-root;--oversubscribe" option is added for OpenMPI. @@ -508,10 +355,7 @@ or_die python3 scripts/config-build.py \ -DGEOS_LA_INTERFACE:PATH=${GEOS_LA_INTERFACE} \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ - -DGEOS_ENABLE_FPE=${GEOS_ENABLE_FPE} \ - "${CMAKE_RELEASE_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ - ${LCOV_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} phase_finish 0 @@ -571,26 +415,11 @@ fi # Run the unit tests (excluding previously ran checks). if [[ "${RUN_UNIT_TESTS}" = true ]]; then - set_openmpi_runtime_defaults - CXX_COMPILER=$(grep '^CMAKE_CXX_COMPILER:' CMakeCache.txt | cut -d= -f2- || true) - if [[ -z "${OMP_NUM_THREADS:-}" && "${CXX_COMPILER}" == *clang* ]]; then - export OMP_NUM_THREADS=1 - echo "OMP_NUM_THREADS was unset; defaulting clang unit tests to OMP_NUM_THREADS=${OMP_NUM_THREADS}." - fi - if [[ -z "${OPENBLAS_NUM_THREADS:-}" && "${CXX_COMPILER}" == *clang* ]]; then - export OPENBLAS_NUM_THREADS=1 - echo "OPENBLAS_NUM_THREADS was unset; defaulting clang unit tests to OPENBLAS_NUM_THREADS=${OPENBLAS_NUM_THREADS}." - fi - if [[ -z "${OMP_PROC_BIND:-}" && "${CXX_COMPILER}" == *clang* ]]; then - export OMP_PROC_BIND=false - echo "OMP_PROC_BIND was unset; defaulting clang unit tests to OMP_PROC_BIND=${OMP_PROC_BIND}." - fi - print_runtime_diagnostics phase_start "Unit tests" if [ ${HOSTNAME} == 'streak.llnl.gov' ] || [ ${HOSTNAME} == 'streak2.llnl.gov' ]; then - or_die ctest --output-on-failure -VV -E "testUncrustifyCheck|testDoxygenCheck|testExternalSolvers" + or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck|testExternalSolvers" else - or_die ctest --output-on-failure -VV -E "testUncrustifyCheck|testDoxygenCheck" + or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck" fi phase_finish 0 fi diff --git a/src/cmake/GeosxOptions.cmake b/src/cmake/GeosxOptions.cmake index 85d16ae19eb..1840f699809 100644 --- a/src/cmake/GeosxOptions.cmake +++ b/src/cmake/GeosxOptions.cmake @@ -168,8 +168,6 @@ blt_append_custom_compiler_flag( FLAGS_VAR GEOS_NINJA_FLAGS CLANG "-fcolor-diagnostics" ) - - # clang-13 and gcc complains about unused-but-set variable. include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-Wunused-but-set-variable" CXX_UNUSED_BUT_SET_VAR) diff --git a/src/coreComponents/mesh/generators/VTKUtilities.cpp b/src/coreComponents/mesh/generators/VTKUtilities.cpp index d56ef6ac977..0f5bea2f589 100644 --- a/src/coreComponents/mesh/generators/VTKUtilities.cpp +++ b/src/coreComponents/mesh/generators/VTKUtilities.cpp @@ -23,8 +23,6 @@ #include "mesh/generators/VTKUtilities.hpp" #include "mesh/MeshFields.hpp" -#include "LvArray/src/system.hpp" - #ifdef GEOS_USE_PARMETIS #include "mesh/generators/ParMETISInterface.hpp" #endif @@ -1420,11 +1418,7 @@ redistributeByKdTree( vtkDataSet & mesh ) vtkNew< vtkRedistributeDataSetFilter > rdsf; rdsf->SetInputDataObject( &mesh ); rdsf->SetNumberOfPartitions( MpiWrapper::commSize() ); - { - // VTK/DIY can raise floating point exceptions while redistributing or serializing partitions. - LvArray::system::FloatingPointExceptionGuard guard; - rdsf->Update(); - } + rdsf->Update(); vtkSmartPointer< vtkDataSet > result = vtkDataSet::SafeDownCast( rdsf->GetOutputDataObject( 0 ) ); From 6162d75194004ff32acf6d77d3bfd73dbb1db78f Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 11:03:54 -0700 Subject: [PATCH 09/23] Update GEOS_TPL_TAG to version 349-1012 --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9de4c2b37eb..7ce8872a8bf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "349-1011" + "GEOS_TPL_TAG": "349-1012" } }, "runArgs": [ From 7e37e541c3ead0ba6fed62985db23deb454ec7da Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 11:44:17 -0700 Subject: [PATCH 10/23] add target specific cuda architecture to CI --- .github/ci/README.md | 5 ++++ .github/ci/orgs/EarthFlowAI.json | 1 + .github/ci/orgs/GEOS-DEV.json | 1 + .github/workflows/build_and_test.yml | 8 +++++- .github/workflows/ci_tests.yml | 32 ++++++++++++++++++++++- scripts/ci_build_and_test_in_container.sh | 9 ++++++- 6 files changed, 53 insertions(+), 3 deletions(-) diff --git a/.github/ci/README.md b/.github/ci/README.md index 2662cf5d3ce..6b37d03012c 100644 --- a/.github/ci/README.md +++ b/.github/ci/README.md @@ -55,6 +55,11 @@ Required fields (all of them, always): the prefix before the first `-`, so a runner label like `streak2-32core` will reuse the `streak2` entry. Use `{}` for runners that do not need an LLNL-style outbound cert bundle. +- `runner_cuda_architectures` + Map keyed by runner label, not by workflow role. Each value is forwarded to CMake as + `CMAKE_CUDA_ARCHITECTURES` for CUDA jobs on that runner. The same exact-match then prefix + fallback used by `runner_ca_bundle_host_paths` applies. Example: `{"streak2": "86"}`. + - `runners` Map from runner role to runner label. Required roles: - `default` diff --git a/.github/ci/orgs/EarthFlowAI.json b/.github/ci/orgs/EarthFlowAI.json index 36a01decd7f..d3653a97192 100644 --- a/.github/ci/orgs/EarthFlowAI.json +++ b/.github/ci/orgs/EarthFlowAI.json @@ -5,6 +5,7 @@ "artifact_public_url_base": "https://pub-17b272fb651e459ca81dd0fd457099ed.r2.dev", "artifact_public_url_bucket_scoped": true, "runner_ca_bundle_host_paths": {}, + "runner_cuda_architectures": { "thinkpad": "120" }, "runners": { "default": "ubuntu-22.04", "cpu_heavy": "32core", diff --git a/.github/ci/orgs/GEOS-DEV.json b/.github/ci/orgs/GEOS-DEV.json index 7700b33d6d6..9ad891e74a0 100644 --- a/.github/ci/orgs/GEOS-DEV.json +++ b/.github/ci/orgs/GEOS-DEV.json @@ -5,6 +5,7 @@ "artifact_public_url_base": "https://storage.googleapis.com", "artifact_public_url_bucket_scoped": false, "runner_ca_bundle_host_paths": { "streak2": "/etc/pki/tls/certs/ca-bundle.crt" }, + "runner_cuda_architectures": { "streak2": "86" }, "runners": { "default": "ubuntu-22.04", "cpu_heavy": "streak2", diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 08e7a8d8370..3633118c8dc 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -16,6 +16,10 @@ on: CMAKE_BUILD_TYPE: required: true type: string + CMAKE_CUDA_ARCHITECTURES: + required: false + type: string + default: '' CODE_COVERAGE: required: false type: boolean @@ -626,6 +630,9 @@ jobs: if [ ! -z "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}" ]; then script_args+=(--geos-enable-bounds-check "${{ inputs.GEOS_ENABLE_BOUNDS_CHECK }}") fi + if [ ! -z "${{ inputs.CMAKE_CUDA_ARCHITECTURES }}" ]; then + script_args+=(--cmake-cuda-architectures "${{ inputs.CMAKE_CUDA_ARCHITECTURES }}") + fi # The linear algebra environment variables (ENABLE_HYPRE, ENABLE_HYPRE_DEVICE & ENABLE_TRILINOS) # are passed as scripts parameters. Specific care must be taken to be sure @@ -859,4 +866,3 @@ jobs: -v "${GITHUB_WORKSPACE}:/tmp/geos" \ alpine:3.20 \ sh -lc 'rm -rf /tmp/geos/* /tmp/geos/.[!.]* /tmp/geos/..?* || true' - diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 34e0f9d67b5..9f699610fa5 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -84,6 +84,7 @@ jobs: SCCACHE_PROFILE: ${{ steps.resolve.outputs.SCCACHE_PROFILE }} INTEGRATED_TESTS_ARTIFACT_BUCKET_PATH: ${{ steps.resolve.outputs.INTEGRATED_TESTS_ARTIFACT_BUCKET_PATH }} DOCKER_CA_BUNDLE_HOST_PATHS_JSON: ${{ steps.resolve.outputs.DOCKER_CA_BUNDLE_HOST_PATHS_JSON }} + CMAKE_CUDA_ARCHITECTURES_JSON: ${{ steps.resolve.outputs.CMAKE_CUDA_ARCHITECTURES_JSON }} RUNNER_LABELS_JSON: ${{ steps.resolve.outputs.RUNNER_LABELS_JSON }} ARTIFACT_UPLOAD_COMMAND: ${{ steps.resolve.outputs.ARTIFACT_UPLOAD_COMMAND }} ARTIFACT_UPLOAD_PRE_COMMAND: ${{ steps.resolve.outputs.ARTIFACT_UPLOAD_PRE_COMMAND }} @@ -141,6 +142,8 @@ jobs: and (.artifact_public_url_bucket_scoped | type == "boolean") and (.runner_ca_bundle_host_paths | type == "object") and (.runner_ca_bundle_host_paths | all(.[]; type == "string")) + and (.runner_cuda_architectures | type == "object") + and (.runner_cuda_architectures | all(.[]; type == "string" and length > 0)) and (.runners | type == "object") and (.runners.default | type == "string" and length > 0) and (.runners.cpu_heavy | type == "string" and length > 0) @@ -148,7 +151,7 @@ jobs: and (.runners.code_coverage | type == "string" and length > 0) and (.runners.cuda | type == "string" and length > 0) ' <<< "${ORG_CONFIG_JSON}" >/dev/null; then - echo "::error::${ORG_CONFIG_PATH} must define every required field: storage_provider, sccache_profile, integrated_tests_artifact_bucket_path, artifact_public_url_base, artifact_public_url_bucket_scoped, runner_ca_bundle_host_paths, and runners.{default,cpu_heavy,integrated_tests,code_coverage,cuda}. See .github/ci/README.md for the full schema." + echo "::error::${ORG_CONFIG_PATH} must define every required field: storage_provider, sccache_profile, integrated_tests_artifact_bucket_path, artifact_public_url_base, artifact_public_url_bucket_scoped, runner_ca_bundle_host_paths, runner_cuda_architectures, and runners.{default,cpu_heavy,integrated_tests,code_coverage,cuda}. See .github/ci/README.md for the full schema." exit 1 fi @@ -160,6 +163,7 @@ jobs: ARTIFACT_PUBLIC_URL_BUCKET_SCOPED="$(jq -r '.artifact_public_url_bucket_scoped' <<< "${ORG_CONFIG_JSON}")" RUNNER_LABELS_JSON="$(jq -c '.runners' <<< "${ORG_CONFIG_JSON}")" RUNNER_CA_BUNDLE_HOST_PATHS_JSON="$(jq -c '.runner_ca_bundle_host_paths' <<< "${ORG_CONFIG_JSON}")" + RUNNER_CUDA_ARCHITECTURES_JSON="$(jq -c '.runner_cuda_architectures' <<< "${ORG_CONFIG_JSON}")" # --- Resolve per-runner-role CA bundle paths. --- # Each runner role picks up the bundle path for its label; if no exact match, @@ -180,6 +184,30 @@ jobs: }' )" + # --- Resolve CUDA architectures by runner role. --- + # Like CA bundle paths, CUDA architectures are keyed by runner label and use prefix fallback. + CMAKE_CUDA_ARCHITECTURES_JSON="$(jq -cn \ + --argjson runners "${RUNNER_LABELS_JSON}" \ + --argjson cuda_architectures "${RUNNER_CUDA_ARCHITECTURES_JSON}" ' + def resolve_arch($runner_label): + ($cuda_architectures[$runner_label] + // (($runner_label | split("-")[0]) as $runner_prefix | $cuda_architectures[$runner_prefix]) + // ""); + { + default: resolve_arch($runners.default), + cpu_heavy: resolve_arch($runners.cpu_heavy), + integrated_tests: resolve_arch($runners.integrated_tests), + code_coverage: resolve_arch($runners.code_coverage), + cuda: resolve_arch($runners.cuda) + }' + )" + + CUDA_RUNNER_LABEL="$(jq -r '.cuda' <<< "${RUNNER_LABELS_JSON}")" + if ! jq -e '.cuda | type == "string" and length > 0' <<< "${CMAKE_CUDA_ARCHITECTURES_JSON}" >/dev/null; then + echo "::error::${ORG_CONFIG_PATH} must define runner_cuda_architectures for CUDA runner '${CUDA_RUNNER_LABEL}'." + exit 1 + fi + # --- Load and validate the provider file. --- # storage_provider names a file under .github/ci/providers/. # Restrict the allowed characters so the provider name cannot escape the directory. @@ -218,6 +246,7 @@ jobs: echo "SCCACHE_PROFILE=${SCCACHE_PROFILE}" echo "INTEGRATED_TESTS_ARTIFACT_BUCKET_PATH=${INTEGRATED_TESTS_ARTIFACT_BUCKET_PATH}" echo "DOCKER_CA_BUNDLE_HOST_PATHS_JSON=${DOCKER_CA_BUNDLE_HOST_PATHS_JSON}" + echo "CMAKE_CUDA_ARCHITECTURES_JSON=${CMAKE_CUDA_ARCHITECTURES_JSON}" echo "RUNNER_LABELS_JSON=${RUNNER_LABELS_JSON}" echo "ARTIFACT_UPLOAD_COMMAND<<__EOF__" printf '%s\n' "${ARTIFACT_UPLOAD_COMMAND}" @@ -596,6 +625,7 @@ jobs: with: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} + CMAKE_CUDA_ARCHITECTURES: ${{ fromJSON(needs.resolve_ci_provider.outputs.CMAKE_CUDA_ARCHITECTURES_JSON)[matrix.RUNNER_KEY || 'default'] }} BUILD_GENERATOR: ${{ matrix.BUILD_GENERATOR }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 61a6ef16a39..a04bb94a1d8 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -106,6 +106,8 @@ Usage: $0 Request for the build of geos only. --cmake-build-type ... One of Debug, Release, RelWithDebInfo and MinSizeRel. Forwarded to CMAKE_BUILD_TYPE. + --cmake-cuda-architectures ... + Optional override for CMAKE_CUDA_ARCHITECTURES. --code-coverage run a code build and test. --data-basename output.tar.gz @@ -153,7 +155,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cuda-architectures:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -174,6 +176,7 @@ NPROC="$(nproc)" GEOS_ENABLE_BOUNDS_CHECK=ON SCCACHE_BIN="" USE_SCCACHE=false +CMAKE_CUDA_ARCHITECTURES_ARGS=() eval set -- ${args} while : @@ -184,6 +187,9 @@ do RUN_UNIT_TESTS=false shift;; --cmake-build-type) CMAKE_BUILD_TYPE=$2; shift 2;; + --cmake-cuda-architectures) + CMAKE_CUDA_ARCHITECTURES_ARGS+=("-DCMAKE_CUDA_ARCHITECTURES=$2") + shift 2;; --ninja) BUILD_GENERATOR=$1; shift;; @@ -355,6 +361,7 @@ or_die python3 scripts/config-build.py \ -DGEOS_LA_INTERFACE:PATH=${GEOS_LA_INTERFACE} \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ + "${CMAKE_CUDA_ARCHITECTURES_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} phase_finish 0 From da808a1dd5e78f04e303f72a2ed4546f4457c3b2 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 16:07:05 -0700 Subject: [PATCH 11/23] fix lcov issue. fix python issue for integrated test --- .github/workflows/ci_tests.yml | 24 ++++++++-------- scripts/ci_build_and_test_in_container.sh | 34 ++++++++++++++++++++--- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 9f699610fa5..7b885829263 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -373,9 +373,9 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK @@ -386,9 +386,9 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - gcc 12 @@ -417,9 +417,9 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 9 - clang 22 @@ -430,9 +430,9 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index a04bb94a1d8..de41cd14b35 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -177,6 +177,7 @@ GEOS_ENABLE_BOUNDS_CHECK=ON SCCACHE_BIN="" USE_SCCACHE=false CMAKE_CUDA_ARCHITECTURES_ARGS=() +LCOV_CMAKE_ARGS="" eval set -- ${args} while : @@ -308,12 +309,12 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then phase_start "Set up integrated test environment" echo "Running the integrated tests has been requested." # We install the python environment required by ATS to run the integrated tests. - #or_die apt-get update - or_die apt-get install -y virtualenv python3-dev python-is-python3 + or_die apt-get update + or_die apt-get install -y python3-dev python3-venv ATS_PYTHON_HOME=/tmp/run_integrated_tests_virtualenv - or_die virtualenv ${ATS_PYTHON_HOME} + or_die python3 -m venv ${ATS_PYTHON_HOME} - python3 -m pip cache purge + ${ATS_PYTHON_HOME}/bin/python3 -m pip cache purge # Setup a temporary directory to hold tests tempdir=$(mktemp -d) @@ -330,6 +331,30 @@ fi if [[ "${CODE_COVERAGE}" = true ]]; then or_die apt-get update or_die apt-get install -y lcov + + LCOV_REAL=$(command -v lcov || true) + if [[ -n "${LCOV_REAL}" ]]; then + export GEOS_REAL_LCOV="${LCOV_REAL}" + LCOV_WRAPPER=/tmp/geos-lcov-wrapper + cat > "${LCOV_WRAPPER}" <<'EOF' +#!/bin/bash +set -e + +extra_args=() +if "${GEOS_REAL_LCOV}" --version 2>&1 | grep -Eq 'LCOV version ([2-9]|[1-9][0-9])\.'; then + for arg in "$@"; do + if [[ "${arg}" == "--capture" || "${arg}" == "-c" ]]; then + extra_args=(--ignore-errors mismatch) + break + fi + done +fi + +exec "${GEOS_REAL_LCOV}" "${extra_args[@]}" "$@" +EOF + or_die chmod +x "${LCOV_WRAPPER}" + LCOV_CMAKE_ARGS="-DLCOV_EXECUTABLE=${LCOV_WRAPPER}" + fi fi # The -DBLT_MPI_COMMAND_APPEND="--allow-run-as-root;--oversubscribe" option is added for OpenMPI. @@ -363,6 +388,7 @@ or_die python3 scripts/config-build.py \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ "${CMAKE_CUDA_ARCHITECTURES_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ + ${LCOV_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} phase_finish 0 From 78c8220bc81e873a0f7abcf85845a629af45ce5d Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 19:13:37 -0700 Subject: [PATCH 12/23] try to fix integrated tests python packages install --- .github/workflows/ci_tests.yml | 14 +++++++------- scripts/ci_build_and_test_in_container.sh | 10 ++++++++-- scripts/setupPythonEnvironment.bash | 10 +++++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7b885829263..d1eca7275de 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -352,7 +352,7 @@ jobs: # Resolved from .github/ci/orgs/.json. RUNNER_KEY: cpu_heavy NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - gcc 13 @@ -375,7 +375,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON # RUNNER_KEY: cpu_heavy # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK @@ -388,7 +388,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: OFF # RUNNER_KEY: cpu_heavy # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - gcc 12 @@ -419,7 +419,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON # RUNNER_KEY: cpu_heavy # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 9 - clang 22 @@ -432,7 +432,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON # RUNNER_KEY: cpu_heavy # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml @@ -574,7 +574,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: OFF RUNNER_KEY: cuda NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia" + DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 19 + CUDA 12.9.1 @@ -588,7 +588,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: OFF RUNNER_KEY: cuda NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia" + DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia" HOST_CONFIG: /spack-generated.cmake # - name: Rocky Linux 8 - clang 19 + CUDA 12.9.1 diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index de41cd14b35..c904fb7868d 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -314,6 +314,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then ATS_PYTHON_HOME=/tmp/run_integrated_tests_virtualenv or_die python3 -m venv ${ATS_PYTHON_HOME} + or_die ${ATS_PYTHON_HOME}/bin/python3 -m pip install --upgrade pip setuptools wheel ${ATS_PYTHON_HOME}/bin/python3 -m pip cache purge # Setup a temporary directory to hold tests @@ -465,8 +466,13 @@ if [[ "${RUN_UNIT_TESTS}" = true ]]; then fi if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then - # fix the setuptools/distutils conflict - export SETUPTOOLS_USE_DISTUTILS=stdlib + PYTHON_MINOR_VERSION="$(${ATS_PYTHON_HOME}/bin/python3 -c 'import sys; print(sys.version_info.minor if sys.version_info.major == 3 else 99)')" + if (( PYTHON_MINOR_VERSION < 12 )); then + # fix the setuptools/distutils conflict + export SETUPTOOLS_USE_DISTUTILS=stdlib + else + unset SETUPTOOLS_USE_DISTUTILS + fi # We split the process in two steps. First installing the environment, then running the tests. phase_start "Build ATS environment" diff --git a/scripts/setupPythonEnvironment.bash b/scripts/setupPythonEnvironment.bash index 9868b75e1ab..fdf478884d3 100755 --- a/scripts/setupPythonEnvironment.bash +++ b/scripts/setupPythonEnvironment.bash @@ -131,11 +131,12 @@ do echo " $p" # Try installing the package - if $VERBOSE - INSTALL_MSG=$($PYTHON_TARGET -m $PIP_CMD install --upgrade $PACKAGE_DIR/$p) - INSTALL_RC=$? + if [[ "${VERBOSE}" == true ]] then - INSTALL_MSG=$($PYTHON_TARGET -m $PIP_CMD install --upgrade $PACKAGE_DIR/$p 2>&1) + INSTALL_MSG=$("${PYTHON_TARGET}" -m ${PIP_CMD} install --upgrade "${PACKAGE_DIR}/${p}") + INSTALL_RC=$? + else + INSTALL_MSG=$("${PYTHON_TARGET}" -m ${PIP_CMD} install --upgrade "${PACKAGE_DIR}/${p}" 2>&1) INSTALL_RC=$? fi @@ -237,4 +238,3 @@ fi echo "Done!" - From dfe55920280b50c9f1cc5274ddb4dbb5cd7916a3 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Mon, 4 May 2026 19:17:22 -0700 Subject: [PATCH 13/23] up memory for debug build --- .github/workflows/ci_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index d1eca7275de..ad0af075cf2 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -352,7 +352,7 @@ jobs: # Resolved from .github/ci/orgs/.json. RUNNER_KEY: cpu_heavy NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" + DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - gcc 13 From b030814398da2a513f3c0c51b005adc4dcae9e68 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 5 May 2026 00:37:18 -0700 Subject: [PATCH 14/23] fix codcov bug --- src/cmake/GeosxMacros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmake/GeosxMacros.cmake b/src/cmake/GeosxMacros.cmake index bb9f670f2e6..f63a7bd830d 100644 --- a/src/cmake/GeosxMacros.cmake +++ b/src/cmake/GeosxMacros.cmake @@ -58,7 +58,8 @@ macro( geosx_add_code_checks ) if (ENABLE_COVERAGE) blt_add_code_coverage_target( NAME ${arg_PREFIX}_coverage RUNNER ctest --progress --output-on-failure -E 'blt_gtest_smoke|blt_mpi_smoke|testUncrustifyCheck|testDoxygenCheck' - SOURCE_DIRECTORIES ${PROJECT_SOURCE_DIR}/coreComponents ) + # BLT forwards SOURCE_DIRECTORIES to lcov --directory, so use a gcda/gcno root. + SOURCE_DIRECTORIES ${CMAKE_BINARY_DIR}/coreComponents ) endif() endmacro( geosx_add_code_checks ) From 3818118dbd5b2e0ec18c899ae8e1655c3dc575f6 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 5 May 2026 07:30:57 -0700 Subject: [PATCH 15/23] Update GEOS_TPL_TAG to version 349-1013 --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7ce8872a8bf..ad28429ee19 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "349-1012" + "GEOS_TPL_TAG": "349-1013" } }, "runArgs": [ From fead093f53fdcc30f55c5595890f75c7b4ae6293 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 5 May 2026 17:25:59 -0700 Subject: [PATCH 16/23] longer runtime for overrun test. native optimization on integratedTests build --- .github/workflows/ci_tests.yml | 6 +- .../poromechanics/poroElasticCoupling.ats | 105 +++++++++++++++++- scripts/ci_build_and_test_in_container.sh | 10 +- 3 files changed, 117 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index ad0af075cf2..aeed14d267c 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -333,12 +333,16 @@ jobs: include: - name: Ubuntu 24.04 - gcc 12 CMAKE_BUILD_TYPE: Release + BUILD_AND_TEST_CLI_ARGS: "--use-native-architecture" DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 GCP_BUCKET: geosx/ubuntu24.04-gcc12 BUILD_SHARED_LIBS: ON ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON + RUNS_ON: ${{ fromJSON(needs.resolve_ci_provider.outputs.RUNNER_LABELS_JSON).integrated_tests }} + NPROC: 32 + DOCKER_RUN_ARGS: "--cpus=32 --memory=384g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - gcc 13 debug @@ -464,7 +468,7 @@ jobs: uses: ./.github/workflows/build_and_test.yml secrets: inherit with: - BUILD_AND_TEST_CLI_ARGS: --build-exe-only + BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --use-native-architecture" BUILD_TYPE: integrated_tests CMAKE_BUILD_TYPE: Release DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} diff --git a/inputFiles/poromechanics/poroElasticCoupling.ats b/inputFiles/poromechanics/poroElasticCoupling.ats index df11ee9ec8e..adfd5cf05ae 100644 --- a/inputFiles/poromechanics/poroElasticCoupling.ats +++ b/inputFiles/poromechanics/poroElasticCoupling.ats @@ -1,4 +1,16 @@ -from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests +import os + +from ats.tests import AtsTest +from geos.ats.test_builder import (TestDeck, RestartcheckParameters, + collect_block_names, logger, + test_build_failures) +from geos.ats.test_case import TestCase +from geos.ats.test_steps import geos + + +TEST_TIMELIMITS = { + "PoroElastic_hybridHexPrism_co2_fim_3d_01": "45m", +} class Description(object): @@ -72,6 +84,95 @@ def _build_poro_elastic_coupling_case(deck, cycles, partitions, description, restartcheck_params=RestartcheckParameters(**restartcheck_params)) +def _generate_poro_elastic_coupling_tests(decks, test_type='smoke'): + for ii, deck in enumerate(decks): + + restartcheck_params = None + curvecheck_params = None + + if deck.restartcheck_params is not None: + restartcheck_params = deck.restartcheck_params.as_dict() + + if deck.curvecheck_params is not None: + curvecheck_params = deck.curvecheck_params.as_dict() + + for partition in deck.partitions: + nx, ny, nz = partition + n_ranks = nx * ny * nz + + testcase_name = "{}_{:02d}".format(deck.name, n_ranks) + base_name = "0to{:d}".format(deck.check_step) + + xml_file = '' + for suffix in ['', f'_{test_type}']: + if os.path.isfile("{}{}.xml".format(deck.name, suffix)): + xml_file = "{}{}.xml".format(deck.name, suffix) + + if not xml_file: + logger.error( + f'Could not find a matching xml file for the test: {deck.name}' + ) + test_build_failures.append(deck.name) + continue + + xml_blocks = collect_block_names(xml_file) + + checks = [] + if curvecheck_params: + checks.append('curve') + + geos_kwargs = {} + if testcase_name in TEST_TIMELIMITS: + geos_kwargs["timelimit"] = TEST_TIMELIMITS[testcase_name] + + steps = [ + geos(deck=xml_file, + name=base_name, + np=n_ranks, + ngpu=n_ranks, + x_partitions=nx, + y_partitions=ny, + z_partitions=nz, + restartcheck_params=restartcheck_params, + curvecheck_params=curvecheck_params, + **geos_kwargs) + ] + + if deck.restart_step > 0: + checks.append('restart') + steps.append( + geos(deck=xml_file, + name="{:d}to{:d}".format(deck.restart_step, + deck.check_step), + np=n_ranks, + ngpu=n_ranks, + x_partitions=nx, + y_partitions=ny, + z_partitions=nz, + restart_file=os.path.join( + testcase_name, + "{}_restart_{:09d}".format( + base_name, deck.restart_step)), + baseline_pattern=rf"{base_name}_restart_[0-9]+\.root", + allow_rebaseline=False, + restartcheck_params=restartcheck_params, + **geos_kwargs)) + + AtsTest.stick(level=ii) + AtsTest.stick(checks=','.join(checks)) + AtsTest.stick(solvers=','.join(xml_blocks.get('Solvers', []))) + AtsTest.stick(outputs=','.join(xml_blocks.get('Outputs', []))) + AtsTest.stick( + constitutive_models=','.join( + xml_blocks.get('Constitutive', []))) + TestCase(name=testcase_name, + desc=deck.description, + label="auto", + owner="GEOS team", + independent=True, + steps=steps) + + def _build_Terzaghi_cases(): description = Description("Terzaghi's 1D Consolidation", "auto", "Nicola Castelletto", True) @@ -333,7 +434,7 @@ def test_poro_elastic_coupling_cases(): _build_PoroElasticCarmanKozenySequential_cases() ] - generate_geos_tests(deck_instances) + _generate_poro_elastic_coupling_tests(deck_instances) test_poro_elastic_coupling_cases() diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index c904fb7868d..5e734545b0f 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -136,6 +136,8 @@ Usage: $0 Do not run the unit tests (but they will be built). --nproc N Number of cores to use for the build. + --use-native-architecture + Build with compiler flags targeting the native runner CPU. --repository /path/to/repository Internal mountpoint where the geos repository will be available. --run-integrated-tests @@ -155,7 +157,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cuda-architectures:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cuda-architectures:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-native-architecture,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -177,6 +179,7 @@ GEOS_ENABLE_BOUNDS_CHECK=ON SCCACHE_BIN="" USE_SCCACHE=false CMAKE_CUDA_ARCHITECTURES_ARGS=() +CMAKE_NATIVE_ARCHITECTURE_ARGS=() LCOV_CMAKE_ARGS="" eval set -- ${args} @@ -215,6 +218,10 @@ do --no-install-schema) GEOS_INSTALL_SCHEMA=false; shift;; --no-run-unit-tests) RUN_UNIT_TESTS=false; shift;; --nproc) NPROC=$2; shift 2;; + --use-native-architecture) + CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_C_FLAGS="-march=native -mtune=native"') + CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_CXX_FLAGS="-march=native -mtune=native"') + shift;; --repository) GEOS_SRC_DIR=$2; shift 2;; --run-integrated-tests) RUN_INTEGRATED_TESTS=true; shift;; --upload-test-baselines) UPLOAD_TEST_BASELINES=true; shift;; @@ -388,6 +395,7 @@ or_die python3 scripts/config-build.py \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ -DGEOS_ENABLE_BOUNDS_CHECK=${GEOS_ENABLE_BOUNDS_CHECK} \ "${CMAKE_CUDA_ARCHITECTURES_ARGS[@]}" \ + "${CMAKE_NATIVE_ARCHITECTURE_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ ${LCOV_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS} From 5230f30b807be95d3790021a3ed86d26d1df5fc0 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 5 May 2026 22:22:46 -0700 Subject: [PATCH 17/23] yet another attempt to fix ccov and integrateTests --- .github/workflows/ci_tests.yml | 6 +++--- scripts/ci_build_and_test_in_container.sh | 4 ++-- src/cmake/GeosxMacros.cmake | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index aeed14d267c..5e08622f08c 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -340,9 +340,9 @@ jobs: ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF GEOS_ENABLE_BOUNDS_CHECK: ON - RUNS_ON: ${{ fromJSON(needs.resolve_ci_provider.outputs.RUNNER_LABELS_JSON).integrated_tests }} - NPROC: 32 - DOCKER_RUN_ARGS: "--cpus=32 --memory=384g" + RUNNER_KEY: cpu_heavy + NPROC: 8 + DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - gcc 13 debug diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 5e734545b0f..9bb7fd65f5b 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -331,7 +331,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then ATS_WORKING_DIR=$tempdir/GEOS_integratedTests_working export ATS_FILTER="np<=32" - ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=32 --ats openmpi_maxprocs=32\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME} -DPython3_EXECUTABLE=${ATS_PYTHON_HOME}/bin/python3 -DATS_BASELINE_DIR=${ATS_BASELINE_DIR} -DATS_WORKING_DIR=${ATS_WORKING_DIR}" + ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=32 --ats openmpi_maxprocs=32 --ats cutoff=45m\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME} -DPython3_EXECUTABLE=${ATS_PYTHON_HOME}/bin/python3 -DATS_BASELINE_DIR=${ATS_BASELINE_DIR} -DATS_WORKING_DIR=${ATS_WORKING_DIR}" phase_finish 0 fi @@ -352,7 +352,7 @@ extra_args=() if "${GEOS_REAL_LCOV}" --version 2>&1 | grep -Eq 'LCOV version ([2-9]|[1-9][0-9])\.'; then for arg in "$@"; do if [[ "${arg}" == "--capture" || "${arg}" == "-c" ]]; then - extra_args=(--ignore-errors mismatch) + extra_args=(--ignore-errors mismatch,empty) break fi done diff --git a/src/cmake/GeosxMacros.cmake b/src/cmake/GeosxMacros.cmake index f63a7bd830d..bb9f670f2e6 100644 --- a/src/cmake/GeosxMacros.cmake +++ b/src/cmake/GeosxMacros.cmake @@ -58,8 +58,7 @@ macro( geosx_add_code_checks ) if (ENABLE_COVERAGE) blt_add_code_coverage_target( NAME ${arg_PREFIX}_coverage RUNNER ctest --progress --output-on-failure -E 'blt_gtest_smoke|blt_mpi_smoke|testUncrustifyCheck|testDoxygenCheck' - # BLT forwards SOURCE_DIRECTORIES to lcov --directory, so use a gcda/gcno root. - SOURCE_DIRECTORIES ${CMAKE_BINARY_DIR}/coreComponents ) + SOURCE_DIRECTORIES ${PROJECT_SOURCE_DIR}/coreComponents ) endif() endmacro( geosx_add_code_checks ) From 693a34e02ecf082056c1f299c1c79e2781436a01 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Tue, 5 May 2026 23:30:44 -0700 Subject: [PATCH 18/23] skipping ubuntu clang19 since it always is missing sccache. change memory alloctions for docker --- .github/workflows/ci_tests.yml | 61 ++++++++++++++-------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 5e08622f08c..973c02c3916 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -331,19 +331,19 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu 24.04 - gcc 12 - CMAKE_BUILD_TYPE: Release - BUILD_AND_TEST_CLI_ARGS: "--use-native-architecture" - DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 - GCP_BUCKET: geosx/ubuntu24.04-gcc12 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: ON - RUNNER_KEY: cpu_heavy - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" - HOST_CONFIG: /spack-generated.cmake + # - name: Ubuntu 24.04 - gcc 12 + # CMAKE_BUILD_TYPE: Release + # BUILD_AND_TEST_CLI_ARGS: "--use-native-architecture" + # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc12 + # GCP_BUCKET: geosx/ubuntu24.04-gcc12 + # BUILD_SHARED_LIBS: ON + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: ON + # RUNNER_KEY: cpu_heavy + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" + # HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - gcc 13 debug BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" @@ -369,18 +369,16 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON HOST_CONFIG: /spack-generated.cmake - - name: Ubuntu 24.04 - clang 19 - CMAKE_BUILD_TYPE: Release - BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - # RUNNER_KEY: cpu_heavy - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" - HOST_CONFIG: /spack-generated.cmake + # this keeps missing sccache so we are skipping it for now. + # - name: Ubuntu 24.04 - clang 19 + # CMAKE_BUILD_TYPE: Release + # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" + # DOCKER_REPOSITORY: geosx/ubuntu24.04-clang19 + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # BUILD_SHARED_LIBS: ON + # GEOS_ENABLE_BOUNDS_CHECK: ON + # HOST_CONFIG: /spack-generated.cmake - name: Ubuntu 24.04 - clang 20 - NO BOUNDS CHECK CMAKE_BUILD_TYPE: Release @@ -390,9 +388,6 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: OFF - # RUNNER_KEY: cpu_heavy - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 8 - gcc 12 @@ -421,9 +416,6 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - # RUNNER_KEY: cpu_heavy - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake - name: Rocky Linux 9 - clang 22 @@ -434,9 +426,6 @@ jobs: ENABLE_TRILINOS: OFF BUILD_SHARED_LIBS: ON GEOS_ENABLE_BOUNDS_CHECK: ON - # RUNNER_KEY: cpu_heavy - # NPROC: 8 - # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g" HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml @@ -487,7 +476,7 @@ jobs: DOCKER_CA_BUNDLE_HOST_PATH: ${{ fromJSON(needs.resolve_ci_provider.outputs.DOCKER_CA_BUNDLE_HOST_PATHS_JSON || '{}').integrated_tests || '' }} RUNS_ON: ${{ fromJSON(needs.resolve_ci_provider.outputs.RUNNER_LABELS_JSON).integrated_tests }} NPROC: 32 - DOCKER_RUN_ARGS: "--cpus=32 --memory=384g" + DOCKER_RUN_ARGS: "--cpus=32 --memory=256g" REQUIRED_LABEL: "ci: run integrated tests" LOCAL_BASELINE_DIR: /data/GEOS/baselines HOST_CONFIG: /spack-generated.cmake @@ -527,7 +516,7 @@ jobs: REQUIRED_LABEL: "ci: run code coverage" HOST_CONFIG: /spack-generated.cmake NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" # mac_builds: From aafb971a4b0721b97a914f7fcec8a06ffcc3dd85 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Wed, 6 May 2026 07:21:18 -0700 Subject: [PATCH 19/23] more gcov issues --- .github/workflows/ci_tests.yml | 2 +- scripts/ci_build_and_test_in_container.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 973c02c3916..70f75969a87 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -355,7 +355,7 @@ jobs: GEOS_ENABLE_BOUNDS_CHECK: ON # Resolved from .github/ci/orgs/.json. RUNNER_KEY: cpu_heavy - NPROC: 8 + NPROC: 4 DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" HOST_CONFIG: /spack-generated.cmake diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 9bb7fd65f5b..cb934c38bca 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -351,10 +351,16 @@ set -e extra_args=() if "${GEOS_REAL_LCOV}" --version 2>&1 | grep -Eq 'LCOV version ([2-9]|[1-9][0-9])\.'; then for arg in "$@"; do - if [[ "${arg}" == "--capture" || "${arg}" == "-c" ]]; then - extra_args=(--ignore-errors mismatch,empty) - break - fi + case "${arg}" in + --capture|-c) + extra_args=(--ignore-errors mismatch,empty) + break + ;; + --remove|-r) + extra_args=(--ignore-errors unused) + break + ;; + esac done fi From 7392b833441c82d11080d3de8799bc37b2897c1f Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Wed, 6 May 2026 13:17:14 -0700 Subject: [PATCH 20/23] another try --- .github/workflows/ci_tests.yml | 4 ++-- scripts/ci_build_and_test_in_container.sh | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 70f75969a87..555ab5332cc 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -515,8 +515,8 @@ jobs: DOCKER_CA_BUNDLE_HOST_PATH: ${{ fromJSON(needs.resolve_ci_provider.outputs.DOCKER_CA_BUNDLE_HOST_PATHS_JSON || '{}').code_coverage || '' }} REQUIRED_LABEL: "ci: run code coverage" HOST_CONFIG: /spack-generated.cmake - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=192g" + NPROC: 4 + DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" # mac_builds: diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index cb934c38bca..365af90f157 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -180,6 +180,7 @@ SCCACHE_BIN="" USE_SCCACHE=false CMAKE_CUDA_ARCHITECTURES_ARGS=() CMAKE_NATIVE_ARCHITECTURE_ARGS=() +ATS_CMAKE_ARGS=() LCOV_CMAKE_ARGS="" eval set -- ${args} @@ -219,8 +220,8 @@ do --no-run-unit-tests) RUN_UNIT_TESTS=false; shift;; --nproc) NPROC=$2; shift 2;; --use-native-architecture) - CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_C_FLAGS="-march=native -mtune=native"') - CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_CXX_FLAGS="-march=native -mtune=native"') + CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_C_FLAGS:STRING="-march=native -mtune=native"') + CMAKE_NATIVE_ARCHITECTURE_ARGS+=('-DCMAKE_CXX_FLAGS:STRING="-march=native -mtune=native"') shift;; --repository) GEOS_SRC_DIR=$2; shift 2;; --run-integrated-tests) RUN_INTEGRATED_TESTS=true; shift;; @@ -331,7 +332,12 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then ATS_WORKING_DIR=$tempdir/GEOS_integratedTests_working export ATS_FILTER="np<=32" - ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=32 --ats openmpi_maxprocs=32 --ats cutoff=45m\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME} -DPython3_EXECUTABLE=${ATS_PYTHON_HOME}/bin/python3 -DATS_BASELINE_DIR=${ATS_BASELINE_DIR} -DATS_WORKING_DIR=${ATS_WORKING_DIR}" + ATS_ARGUMENTS="--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=32 --ats openmpi_maxprocs=32 --ats cutoff=45m" + ATS_CMAKE_ARGS=("-DATS_ARGUMENTS:STRING=\"${ATS_ARGUMENTS}\"" + "-DPython3_ROOT_DIR=${ATS_PYTHON_HOME}" + "-DPython3_EXECUTABLE=${ATS_PYTHON_HOME}/bin/python3" + "-DATS_BASELINE_DIR=${ATS_BASELINE_DIR}" + "-DATS_WORKING_DIR=${ATS_WORKING_DIR}") phase_finish 0 fi @@ -404,7 +410,7 @@ or_die python3 scripts/config-build.py \ "${CMAKE_NATIVE_ARCHITECTURE_ARGS[@]}" \ ${SCCACHE_CMAKE_ARGS} \ ${LCOV_CMAKE_ARGS} \ - ${ATS_CMAKE_ARGS} + "${ATS_CMAKE_ARGS[@]}" phase_finish 0 # The configuration step is now over, we can now move to the build directory for the build! From 444a7bcd5780075394e65fc5d5c3e8b8cedb88a0 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Wed, 6 May 2026 16:47:26 -0700 Subject: [PATCH 21/23] disable codecov --- .github/workflows/build_and_test.yml | 8 +++++ .github/workflows/ci_tests.yml | 44 +++++++++++------------ scripts/ci_build_and_test_in_container.sh | 13 ++++++- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3633118c8dc..03e502ae485 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -24,6 +24,10 @@ on: required: false type: boolean default: false + CTEST_PARALLEL_LEVEL: + required: false + type: string + default: '' DOCKER_IMAGE_TAG: required: true type: string @@ -677,6 +681,10 @@ jobs: docker_args+=(--name ${CONTAINER_NAME}) + if [[ -n "${{ inputs.CTEST_PARALLEL_LEVEL }}" ]]; then + script_args+=(--ctest-parallel-level "${{ inputs.CTEST_PARALLEL_LEVEL }}") + fi + if ${{ inputs.CODE_COVERAGE }} == 'true'; then script_args+=(--code-coverage) fi diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 555ab5332cc..6b553f07160 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -457,7 +457,7 @@ jobs: uses: ./.github/workflows/build_and_test.yml secrets: inherit with: - BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --use-native-architecture" + BUILD_AND_TEST_CLI_ARGS: "--build-exe-only" BUILD_TYPE: integrated_tests CMAKE_BUILD_TYPE: Release DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} @@ -496,27 +496,27 @@ jobs: - name: Check that the baseline logs are modified if rebaselines are detected run: "scripts/check_baseline_log.sh" - code_coverage: - needs: - - is_not_draft_pull_request - - resolve_ci_provider - uses: ./.github/workflows/build_and_test.yml - secrets: inherit - with: - BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - CMAKE_BUILD_TYPE: Debug - CODE_COVERAGE: true - DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} - DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - SCCACHE_PROFILE: ${{ needs.resolve_ci_provider.outputs.SCCACHE_PROFILE }} - RUNS_ON: ${{ fromJSON(needs.resolve_ci_provider.outputs.RUNNER_LABELS_JSON).code_coverage }} - DOCKER_CA_BUNDLE_HOST_PATH: ${{ fromJSON(needs.resolve_ci_provider.outputs.DOCKER_CA_BUNDLE_HOST_PATHS_JSON || '{}').code_coverage || '' }} - REQUIRED_LABEL: "ci: run code coverage" - HOST_CONFIG: /spack-generated.cmake - NPROC: 4 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" + # code_coverage: + # needs: + # - is_not_draft_pull_request + # - resolve_ci_provider + # uses: ./.github/workflows/build_and_test.yml + # secrets: inherit + # with: + # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" + # CMAKE_BUILD_TYPE: Debug + # CODE_COVERAGE: true + # DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }} + # DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # SCCACHE_PROFILE: ${{ needs.resolve_ci_provider.outputs.SCCACHE_PROFILE }} + # RUNS_ON: ${{ fromJSON(needs.resolve_ci_provider.outputs.RUNNER_LABELS_JSON).code_coverage }} + # DOCKER_CA_BUNDLE_HOST_PATH: ${{ fromJSON(needs.resolve_ci_provider.outputs.DOCKER_CA_BUNDLE_HOST_PATHS_JSON || '{}').code_coverage || '' }} + # REQUIRED_LABEL: "ci: run code coverage" + # HOST_CONFIG: /spack-generated.cmake + # NPROC: 4 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g" # mac_builds: diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 365af90f157..2709ae3dbaf 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -110,6 +110,8 @@ Usage: $0 Optional override for CMAKE_CUDA_ARCHITECTURES. --code-coverage run a code build and test. + --ctest-parallel-level N + Number of tests ctest may run in parallel. --data-basename output.tar.gz If some data needs to be extracted from the build, the argument will define the tarball. Has to be a `tar.gz`. --geos-enable-bounds-check @@ -157,7 +159,7 @@ exit 1 # Then we'll move to the build dir. or_die cd $(dirname $0)/.. -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cuda-architectures:,code-coverage,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-native-architecture,use-sccache,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,cmake-cuda-architectures:,code-coverage,ctest-parallel-level:,data-basename:,geos-enable-bounds-check:,enable-hypre:,enable-hypre-device:,enable-trilinos:,exchange-dir:,host-config:,install-dir-basename:,makefile,ninja,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-config:,test-code-style,test-documentation,use-native-architecture,use-sccache,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -174,6 +176,7 @@ TEST_CODE_STYLE=false TEST_DOCUMENTATION=false ENABLE_TRILINOS=OFF CODE_COVERAGE=false +CTEST_PARALLEL_LEVEL_ARG="" NPROC="$(nproc)" GEOS_ENABLE_BOUNDS_CHECK=ON SCCACHE_BIN="" @@ -227,6 +230,9 @@ do --run-integrated-tests) RUN_INTEGRATED_TESTS=true; shift;; --upload-test-baselines) UPLOAD_TEST_BASELINES=true; shift;; --code-coverage) CODE_COVERAGE=true; shift;; + --ctest-parallel-level) + CTEST_PARALLEL_LEVEL_ARG=$2 + shift 2;; --sccache-config) SCCACHE_CONFIG_FILE=$2; shift 2;; --use-sccache) USE_SCCACHE=true; shift;; --test-code-style) TEST_CODE_STYLE=true; shift;; @@ -313,6 +319,11 @@ if [ -z "${NPROC}" ]; then fi echo "Using ${NPROC} cores." +if [[ -n "${CTEST_PARALLEL_LEVEL_ARG}" ]]; then + export CTEST_PARALLEL_LEVEL="${CTEST_PARALLEL_LEVEL_ARG}" + echo "Running ctest with CTEST_PARALLEL_LEVEL=${CTEST_PARALLEL_LEVEL}." +fi + if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then phase_start "Set up integrated test environment" echo "Running the integrated tests has been requested." From 1ee426695e2515f342de3cbf64f6de7822f685b7 Mon Sep 17 00:00:00 2001 From: Nicola Castelletto Date: Wed, 6 May 2026 23:19:03 -0700 Subject: [PATCH 22/23] update LC hostconfigs --- .../dane-toss_4_x86_64_ib-gcc@12.1.1.cmake | 52 ++++++++--------- .../dane-toss_4_x86_64_ib-gcc@13.3.1.cmake | 56 +++++++++---------- .../dane-toss_4_x86_64_ib-llvm@14.0.6.cmake | 52 ++++++++--------- .../dane-toss_4_x86_64_ib-llvm@19.1.3.cmake | 52 ++++++++--------- ...s_4_x86_64_ib-gcc@12.1.1-cuda@12.6.0.cmake | 50 +++++++---------- ...s_4_x86_64_ib-gcc@13.3.1-cuda@12.9.1.cmake | 54 ++++++++---------- ..._4_x86_64_ib-llvm@14.0.6-cuda@12.6.0.cmake | 50 +++++++---------- ..._4_x86_64_ib-llvm@19.1.3-cuda@12.9.1.cmake | 50 +++++++---------- ...x86_64_ib_cray-cce@20.0.0-rocm@6.4.3.cmake | 48 +++++++--------- ...ib_cray-llvm-amdgpu@6.4.3-rocm@6.4.3.cmake | 48 +++++++--------- 10 files changed, 218 insertions(+), 294 deletions(-) diff --git a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake index f9131045ed3..f78c70e7f09 100644 --- a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake +++ b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@12.1.1.cmake @@ -65,15 +65,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/chai-2025.12.0-gj4cge5skn5pmcq7h4rd7vg47zygtx63" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/chai-2025.12.0-gj4cge5skn5pmcq7h4rd7vg47zygtx63" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/raja-2025.12.0-7tz3a6vkc7e642t7zmpxexyi5lqsfafg" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/raja-2025.12.0-7tz3a6vkc7e642t7zmpxexyi5lqsfafg" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/umpire-2025.12.0-qxwp33yhikgs2fkl2vdeobbmal6bqw6n" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/umpire-2025.12.0-qxwp33yhikgs2fkl2vdeobbmal6bqw6n" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/camp-2025.12.0-v3got3dbxmrizv3nk7m6gftc37aen4ym" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/camp-2025.12.0-v3got3dbxmrizv3nk7m6gftc37aen4ym" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -81,23 +81,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/ca set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/caliper-2.14.0-lwnj4cxlrnclq564deuu7tljugndvtnt" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/caliper-2.14.0-lwnj4cxlrnclq564deuu7tljugndvtnt" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-6lz2sfblhg3haec5wghtcahttyei5h3v" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/adiak-0.4.0-6lz2sfblhg3haec5wghtcahttyei5h3v" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/hdf5-1.14.6-7n343tz7mztayupsigyaj7chzbsltayo" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/hdf5-1.14.6-7n343tz7mztayupsigyaj7chzbsltayo" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/conduit-0.9.5-j25t5t5kvxjhbt3vzvrig6ejqyjuy3pl" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/conduit-0.9.5-j25t5t5kvxjhbt3vzvrig6ejqyjuy3pl" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/silo-4.12.0-wo3vlynxc3jkwkunrlikk3645pg76gog" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/silo-4.12.0-wo3vlynxc3jkwkunrlikk3645pg76gog" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-vnpomoy3m4sh7zsnz5uqfn2hp6zh2mzw" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/pugixml-1.13-vnpomoy3m4sh7zsnz5uqfn2hp6zh2mzw" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/vtk-9.4.2-mu24yirl5ddhfv3qzhhbwilxxsjn47dp" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/vtk-9.4.2-mu24yirl5ddhfv3qzhhbwilxxsjn47dp" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/fmt-11.0.2-fbj372jbpfsajq5bzeyhdj4ouz4pgbzm" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/fmt-11.0.2-fbj372jbpfsajq5bzeyhdj4ouz4pgbzm" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -111,19 +111,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-pxv4jh6tetihokv5u7keagd7cytygua7" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/metis-5.1.0-pxv4jh6tetihokv5u7keagd7cytygua7" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-rbzv62lqv7bqm54x5ofwvlgw43wjcalo" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/parmetis-4.0.3-rbzv62lqv7bqm54x5ofwvlgw43wjcalo" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/scotch-7.0.8-eqsq7le3z5srqx2ezsez4yvwu2vq5n6g" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/scotch-7.0.8-eqsq7le3z5srqx2ezsez4yvwu2vq5n6g" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/superlu-dist-9.2.1-n2ffm6w6nh6s7lc3puw6uiffldvtuto4" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/superlu-dist-9.2.1-n2ffm6w6nh6s7lc3puw6uiffldvtuto4" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-d6clmff6msrxrgoecsx6one2cbju6a4t" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/suite-sparse-5.10.1-d6clmff6msrxrgoecsx6one2cbju6a4t" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/trilinos-16.1.0-jxdbiuqjoiln4ezxfbjzgi6dbs4dtpus" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/trilinos-16.1.0-jxdbiuqjoiln4ezxfbjzgi6dbs4dtpus" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-wfynro7iqqothqthqpz3obnelkmpmcnr" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-wfynro7iqqothqthqpz3obnelkmpmcnr" CACHE PATH "") set(ENABLE_HYPREDRV OFF CACHE BOOL "") @@ -149,7 +149,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-lbqhlrg3msfivysu2rfxq674siosbmob/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/doxygen-1.8.20-lbqhlrg3msfivysu2rfxq674siosbmob/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -157,15 +157,7 @@ set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-yqfbyrbgcnjjpkfaijkdtsejzjtpp4ig/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-yqfbyrbgcnjjpkfaijkdtsejzjtpp4ig/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -173,7 +165,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-iz4kph2ijg7inklauzcits2sivybrttp" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-12_tpls/gcc-12.1.1/mathpresso-geos-iz4kph2ijg7inklauzcits2sivybrttp" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@13.3.1.cmake b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@13.3.1.cmake index f713ff43622..cbe77f33a44 100644 --- a/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@13.3.1.cmake +++ b/host-configs/LLNL/dane-toss_4_x86_64_ib-gcc@13.3.1.cmake @@ -65,15 +65,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/chai-2025.12.0-qbuudn4fk6m7wftxulklbk5cw7ozacjf" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/chai-2025.12.0-qbuudn4fk6m7wftxulklbk5cw7ozacjf" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/raja-2025.12.0-g37z6m2jmvyqb7qiwwa37hom3uyp2ypp" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/raja-2025.12.0-g37z6m2jmvyqb7qiwwa37hom3uyp2ypp" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/umpire-2025.12.0-hqtbmsfujzpjxj3kl3jk3bmt3a7k5ety" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/umpire-2025.12.0-hqtbmsfujzpjxj3kl3jk3bmt3a7k5ety" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/camp-2025.12.0-3q3quidchcepoysqupvlwla577e3smyt" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/camp-2025.12.0-3q3quidchcepoysqupvlwla577e3smyt" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -81,23 +81,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/ca set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/caliper-2.14.0-xixabnkvywrgd6a7v766yr74mobs73tx" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/caliper-2.14.0-xixabnkvywrgd6a7v766yr74mobs73tx" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/adiak-0.4.0-u3s7u7hqxlxok3vyus63lfao77t3wvdq" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/adiak-0.4.0-u3s7u7hqxlxok3vyus63lfao77t3wvdq" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/hdf5-1.14.6-ptzjlsdhytvyf5dxp6js6iugmpfd6pqc" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/hdf5-1.14.6-ptzjlsdhytvyf5dxp6js6iugmpfd6pqc" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/conduit-0.9.5-6ockgir74o2gncru2tfhabauss3leyqb" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/conduit-0.9.5-6ockgir74o2gncru2tfhabauss3leyqb" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/silo-4.12.0-zwey5kdj32q7nfz6o6gbgay5mln6qozf" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/silo-4.12.0-zwey5kdj32q7nfz6o6gbgay5mln6qozf" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/vtk-9.4.2-xllx5twzha2typ6vabecuwrdb7dt5vdn" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/vtk-9.4.2-xllx5twzha2typ6vabecuwrdb7dt5vdn" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/fmt-11.0.2-g27pu3mcspwrp46iuo32tkyrrxrhzdrk" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/fmt-11.0.2-g27pu3mcspwrp46iuo32tkyrrxrhzdrk" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -111,21 +111,23 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/metis-5.1.0-7lnhkbv2fdcbtcrv5ubv7og3l6cor54b" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/metis-5.1.0-7lnhkbv2fdcbtcrv5ubv7og3l6cor54b" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/parmetis-4.0.3-3mayiemdzkvic4myatatjp37gx7wmk3k" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/parmetis-4.0.3-3mayiemdzkvic4myatatjp37gx7wmk3k" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/scotch-7.0.8-smdrzzop27f3svwxzwq63aoaol7wwyzu" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/scotch-7.0.8-smdrzzop27f3svwxzwq63aoaol7wwyzu" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/superlu-dist-9.2.1-lkn6ca4m4oejawk3pauulv7qmeiruuhq" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/superlu-dist-9.2.1-lkn6ca4m4oejawk3pauulv7qmeiruuhq" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/suite-sparse-5.10.1-avjp6ihuavwtlx4xgtotehbz2noze2fh" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/suite-sparse-5.10.1-avjp6ihuavwtlx4xgtotehbz2noze2fh" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/trilinos-16.1.0-47kt3mvxzybxrfomkqkr3qbo64hwjzc7" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/trilinos-16.1.0-47kt3mvxzybxrfomkqkr3qbo64hwjzc7" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-gme2drnput4pakha7r4x4i7vcuteuobt" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-gme2drnput4pakha7r4x4i7vcuteuobt" CACHE PATH "") -set(ENABLE_HYPREDRV OFF CACHE BOOL "") +set(ENABLE_HYPREDRV ON CACHE BOOL "") + +set(HYPREDRV_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/hypredrive-git.d062c48cc8d26a9bee92f33f3c588d071c230d30_master-vuvlhl4fs7nhdoqxqz5op37gzuj66m7p" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -149,7 +151,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/doxygen-1.8.20-x3azuxonudnfy6nnvzjyovjkjfncioq2/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/doxygen-1.8.20-x3azuxonudnfy6nnvzjyovjkjfncioq2/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -157,15 +159,7 @@ set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-wp72eon5hcohsatqntmggcspmd3ibryy/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-wp72eon5hcohsatqntmggcspmd3ibryy/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -173,7 +167,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-gcc-13_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-gcc-13-hypredrive_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@14.0.6.cmake b/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@14.0.6.cmake index ff9f267a962..95cf462ce94 100644 --- a/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@14.0.6.cmake +++ b/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@14.0.6.cmake @@ -65,15 +65,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/chai-2025.12.0-pvwccufebbexz5j5332lq7jq7ynwhv3y" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/chai-2025.12.0-pvwccufebbexz5j5332lq7jq7ynwhv3y" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/raja-2025.12.0-s45pq56nd5qutsia5icxw7c7odt4wngp" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/raja-2025.12.0-s45pq56nd5qutsia5icxw7c7odt4wngp" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/umpire-2025.12.0-62eh5t3wbqm3skcy5sl7d744mdrmpi2j" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/umpire-2025.12.0-62eh5t3wbqm3skcy5sl7d744mdrmpi2j" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/camp-2025.12.0-agkxhbph6l3wdetnbv5mrmq5chogauge" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/camp-2025.12.0-agkxhbph6l3wdetnbv5mrmq5chogauge" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -81,23 +81,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/caliper-2.14.0-oahv5uuriqn2vyqbzespzkrfsghxjfew" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/caliper-2.14.0-oahv5uuriqn2vyqbzespzkrfsghxjfew" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/adiak-0.4.0-iitjnfmanurcrmlyau4qm7kpep6q6vxt" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/adiak-0.4.0-iitjnfmanurcrmlyau4qm7kpep6q6vxt" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/hdf5-1.14.6-ottiokh52c2uvkujg6s4yc63afy24e7d" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/hdf5-1.14.6-ottiokh52c2uvkujg6s4yc63afy24e7d" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/conduit-0.9.5-y5dwa2wdrmelzcpyx7yzayckzo3gpgrm" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/conduit-0.9.5-y5dwa2wdrmelzcpyx7yzayckzo3gpgrm" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/silo-4.12.0-24vfiuq62fnn5ui6uqdhvouz65zytin2" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/silo-4.12.0-24vfiuq62fnn5ui6uqdhvouz65zytin2" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/pugixml-1.13-rd24lxieweuz24w7ycbaryfyk6lbznmb" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/pugixml-1.13-rd24lxieweuz24w7ycbaryfyk6lbznmb" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/vtk-9.4.2-fnpua5soyrcqbkrqnnh4zqt6yn5hem5e" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/vtk-9.4.2-fnpua5soyrcqbkrqnnh4zqt6yn5hem5e" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/fmt-11.0.2-voxs6pm2ttqbwt3gszcbvcb2xmugiosj" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/fmt-11.0.2-voxs6pm2ttqbwt3gszcbvcb2xmugiosj" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -111,19 +111,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/metis-5.1.0-7ultypmkrm5nnur3o6ntl557ut4zpi3a" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/metis-5.1.0-7ultypmkrm5nnur3o6ntl557ut4zpi3a" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/parmetis-4.0.3-l7zdwdi3icsmd2ei7lmnytikc4kitsrf" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/parmetis-4.0.3-l7zdwdi3icsmd2ei7lmnytikc4kitsrf" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/scotch-7.0.8-kfvnwp3qofbqvm4duccjctx23zsjfyj3" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/scotch-7.0.8-kfvnwp3qofbqvm4duccjctx23zsjfyj3" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/superlu-dist-9.2.1-ft373aafcmpgtywcvvti4taddmsbqn2r" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/superlu-dist-9.2.1-ft373aafcmpgtywcvvti4taddmsbqn2r" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/suite-sparse-5.10.1-6s5wuk2jv66hevvxm4tjnrxmad6cuqw3" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/suite-sparse-5.10.1-6s5wuk2jv66hevvxm4tjnrxmad6cuqw3" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/trilinos-16.1.0-ugaxqluqwxpbnupdzgkjqjcjx42k5d4n" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/trilinos-16.1.0-ugaxqluqwxpbnupdzgkjqjcjx42k5d4n" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-lb2bbdvaubmyonpm4cecnwyclpp2nt7g" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-lb2bbdvaubmyonpm4cecnwyclpp2nt7g" CACHE PATH "") set(ENABLE_HYPREDRV OFF CACHE BOOL "") @@ -149,7 +149,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/doxygen-1.8.20-r35mgsl7acmueg3o7lu4sm436u6lmeye/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/doxygen-1.8.20-r35mgsl7acmueg3o7lu4sm436u6lmeye/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -157,15 +157,7 @@ set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/ll set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-rmqswrm2hqjas6bshjhhf6vljdk3c663/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-rmqswrm2hqjas6bshjhhf6vljdk3c663/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -173,7 +165,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-14_tpls/llvm-14.0.6/mathpresso-geos-kxwkykrmexwzjykwccwn3p4hl54nsmym" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-14_tpls/llvm-14.0.6/mathpresso-geos-kxwkykrmexwzjykwccwn3p4hl54nsmym" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake b/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake index 2c474985f4a..67374c9c7e3 100644 --- a/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake +++ b/host-configs/LLNL/dane-toss_4_x86_64_ib-llvm@19.1.3.cmake @@ -65,15 +65,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/chai-2025.12.0-zggmegavyen23j54tmeg7q6utmnjse5f" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/chai-2025.12.0-zggmegavyen23j54tmeg7q6utmnjse5f" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/raja-2025.12.0-cajra6jawhf4w6oqzxecxe427r6o2bui" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/raja-2025.12.0-cajra6jawhf4w6oqzxecxe427r6o2bui" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/umpire-2025.12.0-h5pfqtbchzkbxxjxjhmv3paldoeorwme" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/umpire-2025.12.0-h5pfqtbchzkbxxjxjhmv3paldoeorwme" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/camp-2025.12.0-mh3yb77ywuf32gplrc4lhml23ote7yp3" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/camp-2025.12.0-mh3yb77ywuf32gplrc4lhml23ote7yp3" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -81,23 +81,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/caliper-2.14.0-wrc2ypphd35igian2fzgjoy6fsk77oho" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/caliper-2.14.0-wrc2ypphd35igian2fzgjoy6fsk77oho" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/adiak-0.4.0-ujr4y5se43yq4lockjqy7vowt67dw4xw" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/adiak-0.4.0-ujr4y5se43yq4lockjqy7vowt67dw4xw" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/hdf5-1.14.6-4fjfrpi2m2m7h2i3stkstsfpyxf3cgqs" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/hdf5-1.14.6-4fjfrpi2m2m7h2i3stkstsfpyxf3cgqs" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/conduit-0.9.5-r62ftdczyms4lqbth3pwxgklrvhk4pjo" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/conduit-0.9.5-r62ftdczyms4lqbth3pwxgklrvhk4pjo" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/silo-4.12.0-fq3zneqbjlbdm3oabe7do6q6ujl37igk" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/silo-4.12.0-fq3zneqbjlbdm3oabe7do6q6ujl37igk" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/vtk-9.4.2-scfh7fve7yam3m7e2fd4yvxj4ahndf7k" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/vtk-9.4.2-scfh7fve7yam3m7e2fd4yvxj4ahndf7k" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/fmt-11.0.2-togw47kavsjrlxnebp23byhiwvhylawl" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/fmt-11.0.2-togw47kavsjrlxnebp23byhiwvhylawl" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -111,19 +111,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/metis-5.1.0-oxwylf6j2verzocr4vn4njqhtlennylg" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/metis-5.1.0-oxwylf6j2verzocr4vn4njqhtlennylg" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/parmetis-4.0.3-gtl5bhyxtkun2ppcnnzb4ocximklfs4n" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/parmetis-4.0.3-gtl5bhyxtkun2ppcnnzb4ocximklfs4n" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/scotch-7.0.8-4y2qvry7rn7wavoepaoa5wkzf6zmvwce" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/scotch-7.0.8-4y2qvry7rn7wavoepaoa5wkzf6zmvwce" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/superlu-dist-9.2.1-uoomikhpvwtlzu7odatw5duzka7tebar" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/superlu-dist-9.2.1-uoomikhpvwtlzu7odatw5duzka7tebar" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/suite-sparse-5.10.1-tbp64oxbjdeyijs22ngwvsdeszamufwq" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/suite-sparse-5.10.1-tbp64oxbjdeyijs22ngwvsdeszamufwq" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/trilinos-16.1.0-bl7mwswoitytxfeirisjumvgeqyqbgg7" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/trilinos-16.1.0-bl7mwswoitytxfeirisjumvgeqyqbgg7" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-32rnedneuddz3yee6mikkf2xo4m4rb2z" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-32rnedneuddz3yee6mikkf2xo4m4rb2z" CACHE PATH "") set(ENABLE_HYPREDRV OFF CACHE BOOL "") @@ -149,7 +149,7 @@ set(ENABLE_PYGEOSX ON CACHE BOOL "") set(SPHINX_EXECUTABLE "/usr/gapps/GEOSX/thirdPartyLibs/python/quartz-gcc-python/python/bin/sphinx-build" CACHE PATH "") -set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/gcc-13.3.1/doxygen-1.8.20-x3azuxonudnfy6nnvzjyovjkjfncioq2/bin/doxygen" CACHE PATH "") +set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/gcc-13.3.1/doxygen-1.8.20-x3azuxonudnfy6nnvzjyovjkjfncioq2/bin/doxygen" CACHE PATH "") #-------------------------------------------------------------------------------- # Development tools @@ -157,15 +157,7 @@ set(DOXYGEN_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/gc set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/llvm-19.1.3/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-mjajvyor26b46jvqafzpmxt5vc32lica/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/llvm-19.1.3/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-mjajvyor26b46jvqafzpmxt5vc32lica/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -173,7 +165,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/dane-llvm-19_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/dane-llvm-19_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@12.1.1-cuda@12.6.0.cmake b/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@12.1.1-cuda@12.6.0.cmake index 60bbc2da7ce..fb1ca157390 100644 --- a/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@12.1.1-cuda@12.6.0.cmake +++ b/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@12.1.1-cuda@12.6.0.cmake @@ -61,7 +61,7 @@ set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "") -set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_90" CACHE STRING "") +set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -gencode arch=compute_90,code=sm_90" CACHE STRING "") set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "") @@ -79,15 +79,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/chai-2025.12.0-eai7qn6635lcxbo52rxsydh4rytkpjxs" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/chai-2025.12.0-eai7qn6635lcxbo52rxsydh4rytkpjxs" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/raja-2025.12.0-5uzmmaqpyuxzh3c4swijeeihtbbaturz" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/raja-2025.12.0-5uzmmaqpyuxzh3c4swijeeihtbbaturz" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/umpire-2025.12.0-75jwccjcgnx6kkdsabgkulooqpiqe6ks" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/umpire-2025.12.0-75jwccjcgnx6kkdsabgkulooqpiqe6ks" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/camp-2025.12.0-hgj24s6p3cdle65yjc752zkoc75v7zxn" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/camp-2025.12.0-hgj24s6p3cdle65yjc752zkoc75v7zxn" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -95,23 +95,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/g set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/caliper-2.14.0-lwnj4cxlrnclq564deuu7tljugndvtnt" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/caliper-2.14.0-lwnj4cxlrnclq564deuu7tljugndvtnt" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/adiak-0.4.0-6lz2sfblhg3haec5wghtcahttyei5h3v" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/adiak-0.4.0-6lz2sfblhg3haec5wghtcahttyei5h3v" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/hdf5-1.14.6-7n343tz7mztayupsigyaj7chzbsltayo" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/hdf5-1.14.6-7n343tz7mztayupsigyaj7chzbsltayo" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/conduit-0.9.5-j25t5t5kvxjhbt3vzvrig6ejqyjuy3pl" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/conduit-0.9.5-j25t5t5kvxjhbt3vzvrig6ejqyjuy3pl" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/silo-4.12.0-wo3vlynxc3jkwkunrlikk3645pg76gog" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/silo-4.12.0-wo3vlynxc3jkwkunrlikk3645pg76gog" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/pugixml-1.13-vnpomoy3m4sh7zsnz5uqfn2hp6zh2mzw" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/pugixml-1.13-vnpomoy3m4sh7zsnz5uqfn2hp6zh2mzw" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/vtk-9.4.2-mu24yirl5ddhfv3qzhhbwilxxsjn47dp" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/vtk-9.4.2-mu24yirl5ddhfv3qzhhbwilxxsjn47dp" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/fmt-11.0.2-fbj372jbpfsajq5bzeyhdj4ouz4pgbzm" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/fmt-11.0.2-fbj372jbpfsajq5bzeyhdj4ouz4pgbzm" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -125,19 +125,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/metis-5.1.0-pxv4jh6tetihokv5u7keagd7cytygua7" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/metis-5.1.0-pxv4jh6tetihokv5u7keagd7cytygua7" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/parmetis-4.0.3-rbzv62lqv7bqm54x5ofwvlgw43wjcalo" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/parmetis-4.0.3-rbzv62lqv7bqm54x5ofwvlgw43wjcalo" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/scotch-7.0.8-eqsq7le3z5srqx2ezsez4yvwu2vq5n6g" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/scotch-7.0.8-eqsq7le3z5srqx2ezsez4yvwu2vq5n6g" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/superlu-dist-9.2.1-o4lnuxo5k5i7ztokmixcdhewg6yfxzr3" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/superlu-dist-9.2.1-o4lnuxo5k5i7ztokmixcdhewg6yfxzr3" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/suite-sparse-5.10.1-d6clmff6msrxrgoecsx6one2cbju6a4t" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/suite-sparse-5.10.1-d6clmff6msrxrgoecsx6one2cbju6a4t" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/trilinos-16.1.0-jxdbiuqjoiln4ezxfbjzgi6dbs4dtpus" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/trilinos-16.1.0-jxdbiuqjoiln4ezxfbjzgi6dbs4dtpus" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-dggrbwctr2m3vnchkkewncxak6bl6lts" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-dggrbwctr2m3vnchkkewncxak6bl6lts" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -175,21 +175,13 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "") -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") - #-------------------------------------------------------------------------------- # Other #-------------------------------------------------------------------------------- set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/mathpresso-geos-iz4kph2ijg7inklauzcits2sivybrttp" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-12-cuda-12.6_tpls/gcc-12.1.1/mathpresso-geos-iz4kph2ijg7inklauzcits2sivybrttp" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@13.3.1-cuda@12.9.1.cmake b/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@13.3.1-cuda@12.9.1.cmake index c8ed5eb9e11..4023206e459 100644 --- a/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@13.3.1-cuda@12.9.1.cmake +++ b/host-configs/LLNL/matrix-toss_4_x86_64_ib-gcc@13.3.1-cuda@12.9.1.cmake @@ -61,7 +61,7 @@ set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "") -set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_90" CACHE STRING "") +set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -gencode arch=compute_90,code=sm_90" CACHE STRING "") set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "") @@ -79,15 +79,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/chai-2025.12.0-meix2nqnb76bnykuhxydtp6ikahodwld" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/chai-2025.12.0-meix2nqnb76bnykuhxydtp6ikahodwld" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/raja-2025.12.0-ofcrxyx6kb2iwsugddcps4yjsfaws4dz" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/raja-2025.12.0-ofcrxyx6kb2iwsugddcps4yjsfaws4dz" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/umpire-2025.12.0-w3o2oo5becpghphnwxqli5pogj7ni7vi" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/umpire-2025.12.0-w3o2oo5becpghphnwxqli5pogj7ni7vi" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/camp-2025.12.0-c4wmxpp5jwkkfdo3c5ygbfcdpf7xjk2x" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/camp-2025.12.0-c4wmxpp5jwkkfdo3c5ygbfcdpf7xjk2x" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -95,23 +95,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/g set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/caliper-2.14.0-xixabnkvywrgd6a7v766yr74mobs73tx" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/caliper-2.14.0-xixabnkvywrgd6a7v766yr74mobs73tx" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/adiak-0.4.0-u3s7u7hqxlxok3vyus63lfao77t3wvdq" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/adiak-0.4.0-u3s7u7hqxlxok3vyus63lfao77t3wvdq" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/hdf5-1.14.6-ptzjlsdhytvyf5dxp6js6iugmpfd6pqc" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/hdf5-1.14.6-ptzjlsdhytvyf5dxp6js6iugmpfd6pqc" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/conduit-0.9.5-6ockgir74o2gncru2tfhabauss3leyqb" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/conduit-0.9.5-6ockgir74o2gncru2tfhabauss3leyqb" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/silo-4.12.0-zwey5kdj32q7nfz6o6gbgay5mln6qozf" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/silo-4.12.0-zwey5kdj32q7nfz6o6gbgay5mln6qozf" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/pugixml-1.13-vykyowhrjriqfjysczgzijjvo6fbimew" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/vtk-9.4.2-xllx5twzha2typ6vabecuwrdb7dt5vdn" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/vtk-9.4.2-xllx5twzha2typ6vabecuwrdb7dt5vdn" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/fmt-11.0.2-g27pu3mcspwrp46iuo32tkyrrxrhzdrk" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/fmt-11.0.2-g27pu3mcspwrp46iuo32tkyrrxrhzdrk" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -125,23 +125,25 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/metis-5.1.0-7lnhkbv2fdcbtcrv5ubv7og3l6cor54b" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/metis-5.1.0-7lnhkbv2fdcbtcrv5ubv7og3l6cor54b" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/parmetis-4.0.3-3mayiemdzkvic4myatatjp37gx7wmk3k" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/parmetis-4.0.3-3mayiemdzkvic4myatatjp37gx7wmk3k" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/scotch-7.0.8-smdrzzop27f3svwxzwq63aoaol7wwyzu" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/scotch-7.0.8-smdrzzop27f3svwxzwq63aoaol7wwyzu" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/superlu-dist-9.2.1-t7vgyyy3wvegm3sbx3d7o2nts3rrq2bi" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/superlu-dist-9.2.1-t7vgyyy3wvegm3sbx3d7o2nts3rrq2bi" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/suite-sparse-5.10.1-avjp6ihuavwtlx4xgtotehbz2noze2fh" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/suite-sparse-5.10.1-avjp6ihuavwtlx4xgtotehbz2noze2fh" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/trilinos-16.1.0-47kt3mvxzybxrfomkqkr3qbo64hwjzc7" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/trilinos-16.1.0-47kt3mvxzybxrfomkqkr3qbo64hwjzc7" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-zr2d6bddefdt57yp4jixmyabbx3df3rm" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-zr2d6bddefdt57yp4jixmyabbx3df3rm" CACHE PATH "") 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-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/hypredrive-git.d062c48cc8d26a9bee92f33f3c588d071c230d30_master-f4xxel6xtoqnbkv5t2jswoya5atjav6o" CACHE PATH "") set(ENABLE_PETSC OFF CACHE BOOL "") @@ -175,21 +177,13 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "") -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") - #-------------------------------------------------------------------------------- # Other #-------------------------------------------------------------------------------- set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-gcc-13-cuda-12.9_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-gcc-13-cuda-12.9-hypredrive_tpls/gcc-13.3.1/mathpresso-geos-fzt67tuymmzyrl5lhcprtffdhnanu4xq" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@14.0.6-cuda@12.6.0.cmake b/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@14.0.6-cuda@12.6.0.cmake index 961ecfb1481..88b72ef4f57 100644 --- a/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@14.0.6-cuda@12.6.0.cmake +++ b/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@14.0.6-cuda@12.6.0.cmake @@ -61,7 +61,7 @@ set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "") -set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_90" CACHE STRING "") +set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -gencode arch=compute_90,code=sm_90" CACHE STRING "") set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "") @@ -79,15 +79,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/chai-2025.12.0-434reoatceiqmp5nhsvqhmqqh5v66ekl" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/chai-2025.12.0-434reoatceiqmp5nhsvqhmqqh5v66ekl" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/raja-2025.12.0-ftze7ut2hidtld6s6557vwo7kqd7m2d2" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/raja-2025.12.0-ftze7ut2hidtld6s6557vwo7kqd7m2d2" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/umpire-2025.12.0-zvalmcwps5dsita5uhmu5g3zzwdbux7x" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/umpire-2025.12.0-zvalmcwps5dsita5uhmu5g3zzwdbux7x" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/camp-2025.12.0-hzukgfyf3dys4u6ehe6tjpq7r2cwpjgb" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/camp-2025.12.0-hzukgfyf3dys4u6ehe6tjpq7r2cwpjgb" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -95,23 +95,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/caliper-2.14.0-oahv5uuriqn2vyqbzespzkrfsghxjfew" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/caliper-2.14.0-oahv5uuriqn2vyqbzespzkrfsghxjfew" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/adiak-0.4.0-iitjnfmanurcrmlyau4qm7kpep6q6vxt" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/adiak-0.4.0-iitjnfmanurcrmlyau4qm7kpep6q6vxt" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/hdf5-1.14.6-ottiokh52c2uvkujg6s4yc63afy24e7d" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/hdf5-1.14.6-ottiokh52c2uvkujg6s4yc63afy24e7d" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/conduit-0.9.5-y5dwa2wdrmelzcpyx7yzayckzo3gpgrm" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/conduit-0.9.5-y5dwa2wdrmelzcpyx7yzayckzo3gpgrm" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/silo-4.12.0-24vfiuq62fnn5ui6uqdhvouz65zytin2" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/silo-4.12.0-24vfiuq62fnn5ui6uqdhvouz65zytin2" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/pugixml-1.13-rd24lxieweuz24w7ycbaryfyk6lbznmb" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/pugixml-1.13-rd24lxieweuz24w7ycbaryfyk6lbznmb" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/vtk-9.4.2-fnpua5soyrcqbkrqnnh4zqt6yn5hem5e" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/vtk-9.4.2-fnpua5soyrcqbkrqnnh4zqt6yn5hem5e" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/fmt-11.0.2-voxs6pm2ttqbwt3gszcbvcb2xmugiosj" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/fmt-11.0.2-voxs6pm2ttqbwt3gszcbvcb2xmugiosj" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -125,19 +125,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/metis-5.1.0-7ultypmkrm5nnur3o6ntl557ut4zpi3a" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/metis-5.1.0-7ultypmkrm5nnur3o6ntl557ut4zpi3a" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/parmetis-4.0.3-l7zdwdi3icsmd2ei7lmnytikc4kitsrf" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/parmetis-4.0.3-l7zdwdi3icsmd2ei7lmnytikc4kitsrf" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/scotch-7.0.8-kfvnwp3qofbqvm4duccjctx23zsjfyj3" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/scotch-7.0.8-kfvnwp3qofbqvm4duccjctx23zsjfyj3" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/superlu-dist-9.2.1-qyykp4rzu22h7hzag5xubujl2oxl6iqu" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/superlu-dist-9.2.1-qyykp4rzu22h7hzag5xubujl2oxl6iqu" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/suite-sparse-5.10.1-6s5wuk2jv66hevvxm4tjnrxmad6cuqw3" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/suite-sparse-5.10.1-6s5wuk2jv66hevvxm4tjnrxmad6cuqw3" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/trilinos-16.1.0-ugaxqluqwxpbnupdzgkjqjcjx42k5d4n" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/trilinos-16.1.0-ugaxqluqwxpbnupdzgkjqjcjx42k5d4n" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-rp25dcvyczbf7kusq2gn52o2fqufn5eo" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-rp25dcvyczbf7kusq2gn52o2fqufn5eo" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -175,21 +175,13 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "") -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") - #-------------------------------------------------------------------------------- # Other #-------------------------------------------------------------------------------- set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/mathpresso-geos-kxwkykrmexwzjykwccwn3p4hl54nsmym" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-14-cuda-12.6_tpls/llvm-14.0.6/mathpresso-geos-kxwkykrmexwzjykwccwn3p4hl54nsmym" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@19.1.3-cuda@12.9.1.cmake b/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@19.1.3-cuda@12.9.1.cmake index f5a481a0ca4..ded82c4e0b3 100644 --- a/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@19.1.3-cuda@12.9.1.cmake +++ b/host-configs/LLNL/matrix-toss_4_x86_64_ib-llvm@19.1.3-cuda@12.9.1.cmake @@ -61,7 +61,7 @@ set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "") set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "") -set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_90" CACHE STRING "") +set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -gencode arch=compute_90,code=sm_90" CACHE STRING "") set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "") @@ -79,15 +79,15 @@ set(ENABLE_HIP OFF CACHE BOOL "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/chai-2025.12.0-ib2cqysjlzt3wwjl2cufzyi3ue4uhuc7" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/chai-2025.12.0-ib2cqysjlzt3wwjl2cufzyi3ue4uhuc7" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/raja-2025.12.0-r37be665umopzrbi24zswofosnvh7jmz" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/raja-2025.12.0-r37be665umopzrbi24zswofosnvh7jmz" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/umpire-2025.12.0-wgk2v4jqd3unptjuwdaih7p5ulzxv47x" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/umpire-2025.12.0-wgk2v4jqd3unptjuwdaih7p5ulzxv47x" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/camp-2025.12.0-pbx76ulylargqljlodtht4pkntpck35q" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/camp-2025.12.0-pbx76ulylargqljlodtht4pkntpck35q" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -95,23 +95,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/ set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/caliper-2.14.0-kehdscqwtewmtqo5dvchiuc5zazlffuz" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/caliper-2.14.0-kehdscqwtewmtqo5dvchiuc5zazlffuz" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/adiak-0.4.0-pxpenoo7xnjrwg5ozcdvtbiuffclwth7" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/adiak-0.4.0-pxpenoo7xnjrwg5ozcdvtbiuffclwth7" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/hdf5-1.14.6-bnpjs5nouol4334iecw7htzgbdanzx5o" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/hdf5-1.14.6-bnpjs5nouol4334iecw7htzgbdanzx5o" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/conduit-0.9.5-6cuckjyq7gda3nufjxfynbqchpk32f34" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/conduit-0.9.5-6cuckjyq7gda3nufjxfynbqchpk32f34" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/silo-4.12.0-na7kwpkogxpv7phnw2nxj3wl2fdq2tgf" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/silo-4.12.0-na7kwpkogxpv7phnw2nxj3wl2fdq2tgf" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/pugixml-1.13-croztjo7eqsnni3vkno6zmydkeix4t3a" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/pugixml-1.13-croztjo7eqsnni3vkno6zmydkeix4t3a" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/vtk-9.4.2-scfh7fve7yam3m7e2fd4yvxj4ahndf7k" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/vtk-9.4.2-scfh7fve7yam3m7e2fd4yvxj4ahndf7k" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/fmt-11.0.2-7spm6qh5pp5lnym2whrsq3ry5ektpxyv" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/fmt-11.0.2-7spm6qh5pp5lnym2whrsq3ry5ektpxyv" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -125,19 +125,19 @@ set(LAPACK_LIBRARIES /usr/lib64/libopenblas.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/metis-5.1.0-cnjdtwvpu6ncfkvjrcaeolixz65ph5m5" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/metis-5.1.0-cnjdtwvpu6ncfkvjrcaeolixz65ph5m5" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/parmetis-4.0.3-k2l6kwiu536k2mv6tuqkh2cexgutz5un" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/parmetis-4.0.3-k2l6kwiu536k2mv6tuqkh2cexgutz5un" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/scotch-7.0.8-ayjsxukjfngehyi4dc26f3hf4gtcwgfh" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/scotch-7.0.8-ayjsxukjfngehyi4dc26f3hf4gtcwgfh" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/superlu-dist-9.2.1-fxwj4hn3denaalhokks5zr7jwi62otz3" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/superlu-dist-9.2.1-fxwj4hn3denaalhokks5zr7jwi62otz3" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/suite-sparse-5.10.1-vludha7jex5ir5uofrvfjwuofcfa2lz2" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/suite-sparse-5.10.1-vludha7jex5ir5uofrvfjwuofcfa2lz2" CACHE PATH "") -set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/trilinos-16.1.0-wmjfqvmzmnf6r6ywlltau4535jy65rdz" CACHE PATH "") +set(TRILINOS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/trilinos-16.1.0-wmjfqvmzmnf6r6ywlltau4535jy65rdz" CACHE PATH "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-6r5iizitmkl4xixkqwiinqychzjdqrxq" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-6r5iizitmkl4xixkqwiinqychzjdqrxq" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "CUDA" CACHE STRING "") @@ -175,21 +175,13 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "") -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") - #-------------------------------------------------------------------------------- # Other #-------------------------------------------------------------------------------- set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/mathpresso-geos-bqegytlbvvg4io324svtlc74dzam4ifs" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/matrix-llvm-19-cuda-12.9_tpls/llvm-19.1.3/mathpresso-geos-bqegytlbvvg4io324svtlc74dzam4ifs" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-cce@20.0.0-rocm@6.4.3.cmake b/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-cce@20.0.0-rocm@6.4.3.cmake index 6cdb8f0d220..e5c9306c3c1 100644 --- a/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-cce@20.0.0-rocm@6.4.3.cmake +++ b/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-cce@20.0.0-rocm@6.4.3.cmake @@ -73,15 +73,15 @@ set(ROCM_PATH "/opt/rocm-6.4.3" CACHE PATH "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/chai-2025.12.0-xnyu3aqqd7benfr7fkwlates66mruuth" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/chai-2025.12.0-xnyu3aqqd7benfr7fkwlates66mruuth" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/raja-2025.12.0-amgdvrnkwl2oh5lpddgvyupteldgl6ip" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/raja-2025.12.0-amgdvrnkwl2oh5lpddgvyupteldgl6ip" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/umpire-2025.12.0-l7ni3umhaf7f4rwoy4qhjfyrnye3oit6" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/umpire-2025.12.0-l7ni3umhaf7f4rwoy4qhjfyrnye3oit6" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/camp-2025.12.0-p2srwdveimzi7csrjw7o3u4ryxpaz5wm" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/camp-2025.12.0-p2srwdveimzi7csrjw7o3u4ryxpaz5wm" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -89,23 +89,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpl set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/caliper-2.14.0-xfkj7r2zaqfuuugu2wdkppydyr3fwrph" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/caliper-2.14.0-xfkj7r2zaqfuuugu2wdkppydyr3fwrph" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/adiak-0.4.0-6rim24h5wdcrhoaxgpw5mldcufzkfqxb" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/adiak-0.4.0-6rim24h5wdcrhoaxgpw5mldcufzkfqxb" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/hdf5-1.14.6-b55srpmbowvfsql65n2652uh5xj3n3b5" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/hdf5-1.14.6-b55srpmbowvfsql65n2652uh5xj3n3b5" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/conduit-0.9.5-74psmq2xghvj4rfuqymomncufbxjxb7b" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/conduit-0.9.5-74psmq2xghvj4rfuqymomncufbxjxb7b" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/silo-4.12.0-dvjbdqytwnsndxfskcpkdodgj6zr7k5n" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/silo-4.12.0-dvjbdqytwnsndxfskcpkdodgj6zr7k5n" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/pugixml-1.13-o2jle7fb6idvyr32ibcsvm552yq5xqbe" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/pugixml-1.13-o2jle7fb6idvyr32ibcsvm552yq5xqbe" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/vtk-9.4.2-ztzvsmp6mlmtyk5o3rpqbgn7phg7ervu" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/vtk-9.4.2-ztzvsmp6mlmtyk5o3rpqbgn7phg7ervu" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/fmt-11.0.2-x7b5m6zdgekxl3mmjyampxc2pmt4lgur" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/fmt-11.0.2-x7b5m6zdgekxl3mmjyampxc2pmt4lgur" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -119,19 +119,19 @@ set(LAPACK_LIBRARIES /usr/lib64/liblapack.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/metis-5.1.0-oo45sjxzdfx4e4z3qgrmnudzvwfboi7n" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/metis-5.1.0-oo45sjxzdfx4e4z3qgrmnudzvwfboi7n" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/parmetis-4.0.3-onkwfgqwdwkund4tmpvzo3gif3cewf7y" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/parmetis-4.0.3-onkwfgqwdwkund4tmpvzo3gif3cewf7y" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/scotch-7.0.8-wphygatd54wcwziiuvi63jzkzx3pvrp7" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/scotch-7.0.8-wphygatd54wcwziiuvi63jzkzx3pvrp7" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/superlu-dist-9.2.1-t3fmcjdkmgtbi3il5fji6t4mihzrxzni" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/superlu-dist-9.2.1-t3fmcjdkmgtbi3il5fji6t4mihzrxzni" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/suite-sparse-5.10.1-x3vbz2scbieouiqnnqxoirfsvrx7fj5t" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/suite-sparse-5.10.1-x3vbz2scbieouiqnnqxoirfsvrx7fj5t" CACHE PATH "") set(ENABLE_TRILINOS OFF CACHE BOOL "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-bwdj6fuiqwuyd25pegpk3s6zu6bfzvju" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-bwdj6fuiqwuyd25pegpk3s6zu6bfzvju" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "") @@ -169,15 +169,7 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-6hvpggvwvhbhd322pnqivylw2ywdkhaq/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-6hvpggvwvhbhd322pnqivylw2ywdkhaq/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -185,7 +177,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/mathpresso-geos-w3ssu5ocek533pxesneyk3urbxhnhgmw" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-cce-20-rocm-6.4.3_tpls/cce-20.0.0/mathpresso-geos-w3ssu5ocek533pxesneyk3urbxhnhgmw" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") diff --git a/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-llvm-amdgpu@6.4.3-rocm@6.4.3.cmake b/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-llvm-amdgpu@6.4.3-rocm@6.4.3.cmake index f1dbb398895..9a69cb84a20 100644 --- a/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-llvm-amdgpu@6.4.3-rocm@6.4.3.cmake +++ b/host-configs/LLNL/tuolumne-toss_4_x86_64_ib_cray-llvm-amdgpu@6.4.3-rocm@6.4.3.cmake @@ -73,15 +73,15 @@ set(ROCM_PATH "/opt/rocm-6.4.3" CACHE PATH "") set(ENABLE_CHAI ON CACHE BOOL "") -set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/chai-2025.12.0-bui2qjacbspelk7pwk3ap474padtsriy" CACHE PATH "") +set(CHAI_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/chai-2025.12.0-bui2qjacbspelk7pwk3ap474padtsriy" CACHE PATH "") -set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/raja-2025.12.0-phw2uaei64dmmcxcle5ct3jsso262eny" CACHE PATH "") +set(RAJA_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/raja-2025.12.0-phw2uaei64dmmcxcle5ct3jsso262eny" CACHE PATH "") set(ENABLE_UMPIRE ON CACHE BOOL "") -set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/umpire-2025.12.0-7nyetx7q5rljh7z2bcchdutu7ugkxpas" CACHE PATH "") +set(UMPIRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/umpire-2025.12.0-7nyetx7q5rljh7z2bcchdutu7ugkxpas" CACHE PATH "") -set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/camp-2025.12.0-n4t7sxktutnfffuwc2e6z2hya4dbxiti" CACHE PATH "") +set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/camp-2025.12.0-n4t7sxktutnfffuwc2e6z2hya4dbxiti" CACHE PATH "") #-------------------------------------------------------------------------------- # IO TPLs @@ -89,23 +89,23 @@ set(CAMP_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpl set(ENABLE_CALIPER ON CACHE BOOL "") -set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/caliper-2.14.0-nchdbsxkkfwgrezu5azi4iaiwnjx6zy3" CACHE PATH "") +set(CALIPER_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/caliper-2.14.0-nchdbsxkkfwgrezu5azi4iaiwnjx6zy3" CACHE PATH "") -set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/adiak-0.4.0-x7wwsvhjq2ehtw4r7jvzjecdpcxiwfl7" CACHE PATH "") +set(ADIAK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/adiak-0.4.0-x7wwsvhjq2ehtw4r7jvzjecdpcxiwfl7" CACHE PATH "") set(ZLIB_DIR "/usr" CACHE PATH "") -set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/hdf5-1.14.6-qqfx3gxy555optxhwmffsjtwuo7wpwlo" CACHE PATH "") +set(HDF5_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/hdf5-1.14.6-qqfx3gxy555optxhwmffsjtwuo7wpwlo" CACHE PATH "") -set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/conduit-0.9.5-qqbspejhqzbjqxr7antnfuedgxehjysl" CACHE PATH "") +set(CONDUIT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/conduit-0.9.5-qqbspejhqzbjqxr7antnfuedgxehjysl" CACHE PATH "") -set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/silo-4.12.0-ale723hmqzp6vwhbqp3r7xnslpj73pww" CACHE PATH "") +set(SILO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/silo-4.12.0-ale723hmqzp6vwhbqp3r7xnslpj73pww" CACHE PATH "") -set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/pugixml-1.13-yo2g6mdyjdcz3saiq6cewsmilagincwn" CACHE PATH "") +set(PUGIXML_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/pugixml-1.13-yo2g6mdyjdcz3saiq6cewsmilagincwn" CACHE PATH "") -set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/vtk-9.4.2-7rwq4ausmeiweksccifubmdxgb6kmgjw" CACHE PATH "") +set(VTK_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/vtk-9.4.2-7rwq4ausmeiweksccifubmdxgb6kmgjw" CACHE PATH "") -set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/fmt-11.0.2-vjwb72ugeomwqz4kcgt64id6mnkgqzhp" CACHE PATH "") +set(FMT_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/fmt-11.0.2-vjwb72ugeomwqz4kcgt64id6mnkgqzhp" CACHE PATH "") #-------------------------------------------------------------------------------- # System Math Libraries @@ -119,19 +119,19 @@ set(LAPACK_LIBRARIES /usr/lib64/liblapack.so CACHE STRING "") # Math TPLs #-------------------------------------------------------------------------------- -set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/metis-5.1.0-fah7yojtygjosrxaywxuhy6arel2a5o3" CACHE PATH "") +set(METIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/metis-5.1.0-fah7yojtygjosrxaywxuhy6arel2a5o3" CACHE PATH "") -set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/parmetis-4.0.3-ztyzko3dlrcb5mfhkvxdwvgoyyq7wbl3" CACHE PATH "") +set(PARMETIS_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/parmetis-4.0.3-ztyzko3dlrcb5mfhkvxdwvgoyyq7wbl3" CACHE PATH "") -set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/scotch-7.0.8-5t6uibtbtbfdbkisch7rgxvy44pgw6pm" CACHE PATH "") +set(SCOTCH_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/scotch-7.0.8-5t6uibtbtbfdbkisch7rgxvy44pgw6pm" CACHE PATH "") -set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/superlu-dist-9.2.1-m66d72gxlkboj7tdkfmuxww2auhzraii" CACHE PATH "") +set(SUPERLU_DIST_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/superlu-dist-9.2.1-m66d72gxlkboj7tdkfmuxww2auhzraii" CACHE PATH "") -set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/suite-sparse-5.10.1-iwxia6d76g2r6dwnto2iajidfws2j3ts" CACHE PATH "") +set(SUITESPARSE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/suite-sparse-5.10.1-iwxia6d76g2r6dwnto2iajidfws2j3ts" CACHE PATH "") set(ENABLE_TRILINOS OFF CACHE BOOL "") -set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-jiobpmxaz3fp5dp6wt5tyqewmzv3a3q6" CACHE PATH "") +set(HYPRE_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/hypre-git.8b0093306228fef1b92384d9face7fbe5a63b460_master-jiobpmxaz3fp5dp6wt5tyqewmzv3a3q6" CACHE PATH "") set(ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "") @@ -169,15 +169,7 @@ set(ENABLE_SPHINX OFF CACHE BOOL "") set(ENABLE_UNCRUSTIFY ON CACHE BOOL "") -set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-b7rjjhdbf6yqcn5br6rzvsngyvb2i4ha/bin/uncrustify" CACHE PATH "") - -#-------------------------------------------------------------------------------- -# addr2line -#-------------------------------------------------------------------------------- - -set(ENABLE_ADDR2LINE ON CACHE BOOL "") - -set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") +set(UNCRUSTIFY_EXECUTABLE "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/uncrustify-git.401a4098bce9dcc47e024987403f2d59d9ba7bd2_0.70.1-git.319-b7rjjhdbf6yqcn5br6rzvsngyvb2i4ha/bin/uncrustify" CACHE PATH "") #-------------------------------------------------------------------------------- # Other @@ -185,7 +177,7 @@ set(ADDR2LINE_EXEC "/usr/bin/addr2line" CACHE PATH "") set(ENABLE_MATHPRESSO ON CACHE BOOL "") -set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-04-03/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/mathpresso-geos-nolryyeptxklghofeiszkkyyhd6don35" CACHE PATH "") +set(MATHPRESSO_DIR "/usr/WS1/GEOS/GEOSX/TPLs_2026-05-05/tuolumne-llvm-amdgpu-6.4.3_tpls/llvm-amdgpu-6.4.3/mathpresso-geos-nolryyeptxklghofeiszkkyyhd6don35" CACHE PATH "") set(ENABLE_XML_UPDATES ON CACHE BOOL "") From 5188bcd00f608e5e826b5104a7c58c598f19fdfc Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Wed, 6 May 2026 23:20:01 -0700 Subject: [PATCH 23/23] update TPL TAG --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ad28429ee19..692ecc9d08e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "349-1013" + "GEOS_TPL_TAG": "349-1014" } }, "runArgs": [