From ce090097133912942d64c943ea3a9a7aea0a281a Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 6 Jun 2024 10:06:35 -0700 Subject: [PATCH] Try Sherlock CPU/GPU --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci_tests.yml | 42 ++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bc3ac1d7457..59bc868ac4c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "261-281" + "GEOS_TPL_TAG": "261-329" } }, "runArgs": [ diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index a881e8cbecd..bd0046ac019 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -169,13 +169,13 @@ jobs: GCP_BUCKET: geosx/Pangea2 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 - # GCP_BUCKET: geosx/Sherlock-CPU - # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.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 + GCP_BUCKET: geosx/Sherlock-CPU + HOST_CONFIG: /spack-generated.cmake uses: ./.github/workflows/build_and_test.yml with: @@ -296,24 +296,24 @@ jobs: # HOST_CONFIG: /spack-generated.cmake # Below this line, jobs that deploy to Google Cloud. - - name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119) - BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" + # - name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119) + # BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" + # CMAKE_BUILD_TYPE: Release + # DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119 + # HOST_CONFIG: /spack-generated.cmake + # RUNS_ON: Runner_4core_16GB + + - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 11.7.1,) + BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119 + DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11 + ENABLE_HYPRE_DEVICE: CUDA + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GCP_BUCKET: geosx/Sherlock-GPU HOST_CONFIG: /spack-generated.cmake RUNS_ON: Runner_4core_16GB - # - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 11.7.1,) - # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11 - # ENABLE_HYPRE_DEVICE: CUDA - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GCP_BUCKET: geosx/Sherlock-GPU - # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake - # RUNS_ON: Runner_4core_16GB - uses: ./.github/workflows/build_and_test.yml with: BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }}