Skip to content

Commit 1e12d1f

Browse files
bmhan12victorapmjhuang2601
authored
ci: Spack 1.0.2 (#3848)
* Update Spack uberenv ReadTheDocs * Update LC host-configs --------- Co-authored-by: Victor A. P. Magri <50467563+victorapm@users.noreply.github.com> Co-authored-by: Jian Huang <53012159+jhuang2601@users.noreply.github.com>
1 parent 1ac918a commit 1e12d1f

17 files changed

+878
-714
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": "320-766"
5+
"GEOS_TPL_TAG": "324-875"
66
}
77
},
88
"runArgs": [

.github/workflows/ci_tests.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,16 @@ jobs:
213213
BUILD_SHARED_LIBS: ON
214214
HOST_CONFIG: /spack-generated.cmake
215215

216-
- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10)
217-
CMAKE_BUILD_TYPE: Release
218-
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
219-
ENABLE_HYPRE: ON
220-
ENABLE_TRILINOS: OFF
221-
GEOS_ENABLE_BOUNDS_CHECK: OFF
222-
GCP_BUCKET: geosx/Sherlock-CPU
223-
HOST_CONFIG: /spack-generated.cmake
224-
# HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake
225-
BUILD_SHARED_LIBS: ON
216+
#- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10)
217+
# CMAKE_BUILD_TYPE: Release
218+
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
219+
# ENABLE_HYPRE: ON
220+
# ENABLE_TRILINOS: OFF
221+
# GEOS_ENABLE_BOUNDS_CHECK: OFF
222+
# GCP_BUCKET: geosx/Sherlock-CPU
223+
# HOST_CONFIG: /spack-generated.cmake
224+
# # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake
225+
# BUILD_SHARED_LIBS: ON
226226

227227
uses: ./.github/workflows/build_and_test.yml
228228
with:
@@ -400,22 +400,22 @@ jobs:
400400
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
401401
HOST_CONFIG: /spack-generated-wave-solver-only.cmake
402402

403-
- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,)
404-
BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
405-
BUILD_GENERATOR: "--ninja"
406-
CMAKE_BUILD_TYPE: Release
407-
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
408-
ENABLE_HYPRE_DEVICE: CUDA
409-
ENABLE_HYPRE: ON
410-
ENABLE_TRILINOS: OFF
411-
GEOS_ENABLE_BOUNDS_CHECK: OFF
412-
GCP_BUCKET: geosx/Sherlock-GPU
413-
RUNS_ON: streak2
414-
NPROC: 8
415-
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
416-
DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
417-
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
418-
HOST_CONFIG: /spack-generated.cmake
403+
#- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,)
404+
# BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
405+
# BUILD_GENERATOR: "--ninja"
406+
# CMAKE_BUILD_TYPE: Release
407+
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
408+
# ENABLE_HYPRE_DEVICE: CUDA
409+
# ENABLE_HYPRE: ON
410+
# ENABLE_TRILINOS: OFF
411+
# GEOS_ENABLE_BOUNDS_CHECK: OFF
412+
# GCP_BUCKET: geosx/Sherlock-GPU
413+
# RUNS_ON: streak2
414+
# NPROC: 8
415+
# DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
416+
# DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
417+
# DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
418+
# HOST_CONFIG: /spack-generated.cmake
419419

420420
# Below this line, jobs that deploy to Google Cloud.
421421

host-configs/LLNL/dane-toss_4_x86_64_ib-clang@19.1.3.cmake

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)