From 76adca46526f4f9c5b9f8309ee01c69583dea460 Mon Sep 17 00:00:00 2001
From: Brian Han <han12@llnl.gov>
Date: Thu, 30 May 2024 11:19:19 -0700
Subject: [PATCH] Try Pecan CPU/GPU

---
 .devcontainer/devcontainer.json      |  2 +-
 .github/workflows/build_and_test.yml |  2 +-
 .github/workflows/ci_tests.yml       | 42 ++++++++++++++--------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 77ee7d83ef3..bc3ac1d7457 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "GEOS_TPL_TAG": "261-272"
+            "GEOS_TPL_TAG": "261-281"
         }
     },
     "runArgs": [
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index fd4174429ae..da32557e306 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -73,7 +73,7 @@ jobs:
     steps:
     - name: does_pr_have_necessary_labels
       if: ${{inputs.REQUIRED_LABEL && github.event_name == 'pull_request'}}
-      run: | 
+      run: |
         pr_json=$(curl -H "Accept: application/vnd.github+json" https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.number }})
         LABELS=$(echo ${pr_json} | jq -crM '[.labels[].name]')
         echo " the labels are ${LABELS}"
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 1f46f0dc2a1..a881e8cbecd 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -155,11 +155,11 @@ jobs:
             ENABLE_TRILINOS: OFF
             HOST_CONFIG: /spack-generated.cmake
 
-          #- name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
-          #  CMAKE_BUILD_TYPE: Release
-          #  DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
-          #  HOST_CONFIG: host-configs/TOTAL/pecan-CPU.cmake
-          #  GCP_BUCKET: geosx/Pecan-CPU
+          - name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
+            CMAKE_BUILD_TYPE: Release
+            DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
+            HOST_CONFIG: /spack-generated.cmake
+            GCP_BUCKET: geosx/Pecan-CPU
 
           - name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
             CMAKE_BUILD_TYPE: Release
@@ -284,24 +284,24 @@ jobs:
           #  DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates"
           #  HOST_CONFIG: /spack-generated.cmake
 
-          - name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
-            BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
-            CMAKE_BUILD_TYPE: Release
-            DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89
-            RUNS_ON: streak2
-            NPROC: 16
-            DOCKER_RUN_ARGS: "--cpus=16 --memory=256g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
-            DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
-            DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
-            HOST_CONFIG: /spack-generated.cmake
+          # - name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
+          #   BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
+          #   CMAKE_BUILD_TYPE: Release
+          #   DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89
+          #   RUNS_ON: streak2
+          #   NPROC: 16
+          #   DOCKER_RUN_ARGS: "--cpus=16 --memory=256g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl: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.
-          # - 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: host-configs/TOTAL/pecan-GPU.cmake
-          #   RUNS_ON: Runner_4core_16GB
+          - 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"