Skip to content

Commit 0ba1f36

Browse files
AlgianeBubusch
andauthored
ci: Time-saving version of PR #3159 that adds Pangea3 job with ppc emulation (#3340)
* Add pangea-3 job and emulation step. * Replace relative path in cmake for P3-wave-solver host-config file. * Build wave solver only in Pangea 3 job. * Build Geos executable only in Pangea 3 job. --------- Co-authored-by: Gaetan <[email protected]>
1 parent 096aff6 commit 0ba1f36

File tree

4 files changed

+43
-1
lines changed

4 files changed

+43
-1
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"build": {
33
"dockerfile": "Dockerfile",
44
"args": {
5-
"GEOS_TPL_TAG": "280-510"
5+
"GEOS_TPL_TAG": "257-513"
66
}
77
},
88
"runArgs": [

.github/workflows/build_and_test.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ on:
5555
required: false
5656
type: string
5757
default: ''
58+
HOST_ARCH:
59+
required: false
60+
type: string
5861
RUNS_ON:
5962
required: true
6063
type: string
@@ -122,6 +125,12 @@ jobs:
122125
- name: Print environment
123126
run: printenv
124127

128+
- name: Setup QEMU for ${{ inputs.HOST_ARCH }} emulation
129+
if: ${{ inputs.HOST_ARCH }}
130+
uses: docker/setup-qemu-action@v3
131+
with:
132+
platforms: ${{ inputs.HOST_ARCH }}
133+
125134
- name: Build, test, deploy.
126135
run: |
127136
# Those two bash arrays will be populated depending on the required options,

.github/workflows/ci_tests.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,23 @@ jobs:
328328
DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
329329
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
330330

331+
- name: Pangea 3 (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10)
332+
BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema"
333+
CMAKE_BUILD_TYPE: Release
334+
BUILD_GENERATOR: "--makefile"
335+
DOCKER_REPOSITORY: geosx/pangea3-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18
336+
HOST_CONFIG: host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2-wave-solver.cmake
337+
ENABLE_HYPRE_DEVICE: CUDA
338+
ENABLE_HYPRE: ON
339+
ENABLE_TRILINOS: OFF
340+
HOST_ARCH: ppc64le
341+
RUNS_ON: streak2
342+
NPROC: 8
343+
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
344+
DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
345+
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
346+
347+
331348
# Below this line, jobs that deploy to Google Cloud.
332349

333350
uses: ./.github/workflows/build_and_test.yml
@@ -343,6 +360,9 @@ jobs:
343360
ENABLE_HYPRE_DEVICE: ${{ matrix.ENABLE_HYPRE_DEVICE }}
344361
ENABLE_HYPRE: ${{ matrix.ENABLE_HYPRE }}
345362
ENABLE_TRILINOS: ${{ matrix.ENABLE_TRILINOS }}
363+
GCP_BUCKET: ${{ matrix.GCP_BUCKET }}
364+
HOST_ARCH: ${{ matrix.HOST_ARCH }}
365+
HOST_CONFIG: ${{ matrix.HOST_CONFIG }}
346366
NPROC: ${{ matrix.NPROC }}
347367
RUNS_ON: ${{ matrix.RUNS_ON }}
348368
REQUIRED_LABEL: "ci: run CUDA builds"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# hostconfig to build only the wave solver on pangea3
2+
#
3+
#
4+
include( ${CMAKE_CURRENT_LIST_DIR}/pangea3-gcc8.4.1-openmpi-4.1.2.cmake )
5+
6+
set ( GEOS_ENABLE_CONTACT OFF CACHE BOOL "" FORCE )
7+
set ( GEOS_ENABLE_FLUIDFLOW OFF CACHE BOOL "" FORCE )
8+
set ( GEOS_ENABLE_INDUCEDSEISMICITY OFF CACHE BOOL "" FORCE )
9+
set ( GEOS_ENABLE_MULTIPHYSICS OFF CACHE BOOL "" FORCE )
10+
set ( GEOS_ENABLE_SIMPLEPDE OFF CACHE BOOL "" FORCE )
11+
set ( GEOS_ENABLE_SOLIDMECHANICS OFF CACHE BOOL "" FORCE )
12+
set ( GEOS_ENABLE_SURFACEGENERATION OFF CACHE BOOL "" FORCE )
13+

0 commit comments

Comments
 (0)