Skip to content
Merged
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: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "320-766"
"GEOS_TPL_TAG": "324-875"
}
},
"runArgs": [
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ jobs:
BUILD_SHARED_LIBS: ON
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
GEOS_ENABLE_BOUNDS_CHECK: OFF
GCP_BUCKET: geosx/Sherlock-CPU
HOST_CONFIG: /spack-generated.cmake
# HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake
BUILD_SHARED_LIBS: ON
#- 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
# GEOS_ENABLE_BOUNDS_CHECK: OFF
# GCP_BUCKET: geosx/Sherlock-CPU
# HOST_CONFIG: /spack-generated.cmake
# # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake
# BUILD_SHARED_LIBS: ON

uses: ./.github/workflows/build_and_test.yml
with:
Expand Down Expand Up @@ -400,22 +400,22 @@ jobs:
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
HOST_CONFIG: /spack-generated-wave-solver-only.cmake

- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,)
BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
BUILD_GENERATOR: "--ninja"
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
ENABLE_HYPRE_DEVICE: CUDA
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF
GEOS_ENABLE_BOUNDS_CHECK: OFF
GCP_BUCKET: geosx/Sherlock-GPU
RUNS_ON: streak2
NPROC: 8
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --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: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,)
# BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
# BUILD_GENERATOR: "--ninja"
# CMAKE_BUILD_TYPE: Release
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
# ENABLE_HYPRE_DEVICE: CUDA
# ENABLE_HYPRE: ON
# ENABLE_TRILINOS: OFF
# GEOS_ENABLE_BOUNDS_CHECK: OFF
# GCP_BUCKET: geosx/Sherlock-GPU
# RUNS_ON: streak2
# NPROC: 8
# DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --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.

Expand Down
182 changes: 0 additions & 182 deletions host-configs/LLNL/dane-toss_4_x86_64_ib-clang@19.1.3.cmake

This file was deleted.

Loading