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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
tplMirror/*.gz filter=lfs diff=lfs merge=lfs -text
tplMirror/*.zip filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
25 changes: 24 additions & 1 deletion .github/workflows/docker_build_tpls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,20 @@ jobs:
# DOCKER_REPOSITORY: geosx/rockylinux9-gcc15-cuda13.2.1
# SPEC: "+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs %gcc-15 ^cuda@13.2.1+allow-unsupported-compilers"

# ROCm build. Unlike the rows above it does not layer on a
# geosx/<os>:<tag>-<sha> base image: AMD's own ROCm image already
# ships the amdclang toolchain and the ROCm math libraries, so the
# base image is given literally via DOCKER_BASE_IMAGE_OVERRIDE.
- name: Ubuntu 24.04 - amdclang 19 + ROCm 6.4.3
RUNS_ON: streak2
TPL_DOCKERFILE: docker/tpl-ubuntu-hip.Dockerfile
DOCKER_BASE_IMAGE_OVERRIDE: rocm/dev-ubuntu-24.04:6.4.3
DOCKER_REPOSITORY: geosx/ubuntu24.04-amdclang19.0.0-rocm6.4.3
ROCM_VERSION: 6.4.3
AMDGPU_TARGET: gfx942
SPACK_BUILD_JOBS: 8
SPEC: "+rocm ~uncrustify ~openmp ~pygeosx ~docs ~trilinos ~petsc amdgpu_target=gfx942 %%amdclang-19 ^caliper~papi~gotcha~sampler~libunwind~libdw"

steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -182,7 +196,13 @@ jobs:
- name: Compose DOCKER_BASE_IMAGE
id: base
run: |
echo "DOCKER_BASE_IMAGE=${{ matrix.DOCKER_BASE_IMAGE_REPO }}:${{ matrix.DOCKER_BASE_IMAGE_TAG }}-${DOCKER_BASE_IMAGE_SHA}" >> "$GITHUB_OUTPUT"
# Rows that do not build on a docker_base_images image (e.g. ROCm)
# pin their base image directly.
if [ -n "${{ matrix.DOCKER_BASE_IMAGE_OVERRIDE }}" ]; then
echo "DOCKER_BASE_IMAGE=${{ matrix.DOCKER_BASE_IMAGE_OVERRIDE }}" >> "$GITHUB_OUTPUT"
else
echo "DOCKER_BASE_IMAGE=${{ matrix.DOCKER_BASE_IMAGE_REPO }}:${{ matrix.DOCKER_BASE_IMAGE_TAG }}-${DOCKER_BASE_IMAGE_SHA}" >> "$GITHUB_OUTPUT"
fi

- name: Inject CA certificate into Docker build
if: matrix.RUNS_ON == 'streak2'
Expand Down Expand Up @@ -227,6 +247,9 @@ jobs:
DOCKER_BASE_IMAGE: ${{ steps.base.outputs.DOCKER_BASE_IMAGE }}
GCC_VERSION: ${{ matrix.GCC_VERSION }}
CLANG_VERSION: ${{ matrix.CLANG_VERSION }}
ROCM_VERSION: ${{ matrix.ROCM_VERSION }}
AMDGPU_TARGET: ${{ matrix.AMDGPU_TARGET }}
SPACK_BUILD_JOBS: ${{ matrix.SPACK_BUILD_JOBS }}
INSTALL_DIR_ROOT: ${{ matrix.INSTALL_DIR_ROOT || '/opt/GEOS' }}
HOST_CONFIG: ${{ matrix.HOST_CONFIG || 'host-configs/environment.cmake' }}
SPEC: ${{ matrix.SPEC || 'undefined' }}
Expand Down
5 changes: 3 additions & 2 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"spack_url": "https://github.com/spack/spack",
"spack_commit": "3e19345b6e12f5ff1b874f4059622fc6a1fd804a",
"spack_commit_note": "v1.2.2 (Jul 20th 2026)",
"spack_packages_commit": "bd9b4838fbf9e4ca01ad7b6c6df633ddcc750d71",
"spack_packages_note": "Jul 20th 2026"
"spack_packages_commit": "9bb5e217dd9f9233991e0b4ceb407849588a0fa4",
"spack_packages_note": "Aug 20th 2026",
"spack_setup_clingo": 0
}
113 changes: 81 additions & 32 deletions CMakeLists.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/install-sccache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -xe

# Install `sccache` binaries to speed up the build of `geos`
VERSION=${1-0.7.7}
VERSION=${1-0.17.0}
PREFIX=${2-/opt/sccache}

mkdir -p $PREFIX/bin
Expand Down
Loading