Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade some CI images, reactivate sherlock and clean up some old files. #282

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 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
14 changes: 14 additions & 0 deletions .github/workflows/docker_build_tpls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,20 @@ jobs:
DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.5
DOCKERFILE: docker/tpl-rockylinux-clang-cuda-12.Dockerfile
RUNS_ON: Runner_4core_16GB
- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11)
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
DOCKERFILE: docker/Stanford/Dockerfile
DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-no-geosx:0.0.2
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU
RUNS_ON: ubuntu-latest
- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 12.4.0, openblas 0.3.10, zlib 1.2.11)
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11
DOCKERFILE: docker/Stanford/Dockerfile
DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda12.4.0-openblas0.3.10-zlib1.2.11-no-geosx:0.0.2
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda12.4.0-sm70.cmake
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
RUNS_ON: ubuntu-latest

steps:
- name: Checkout
Expand Down
1 change: 0 additions & 1 deletion docker/Stanford/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ARG TMP_DIR=/tmp
ARG SRC_DIR=$TMP_DIR/thirdPartyLibs
ARG BLD_DIR=$TMP_DIR/build

# The docker base image can be pecan or pangea.
ARG DOCKER_ROOT_IMAGE
FROM $DOCKER_ROOT_IMAGE as tpl_toolchain_intersect_geosx_toolchain
ARG SRC_DIR
Expand Down
10 changes: 8 additions & 2 deletions docker/Stanford/Sherlock.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ ARG GCC_VERSION=10.1.0
ARG OPENMPI_VERSION=4.1.2
ARG OPENBLAS_VERSION=0.3.10
ARG ZLIB_VERSION=1.2.11
ARG CUDA_VERSION=11.7.1
ARG CUDA_SUBVERSION=515.65.01
ARG CUDA_VERSION=12.4.0
ARG CUDA_SUBVERSION=550.54.14


# Main software root installation directory in SHERLOCK
ARG SHERLOCK_ROOT_INSTALL_DIR=/share/software/user/open
Expand All @@ -28,6 +29,11 @@ FROM centos:7.9.2009 AS shared_components
RUN yum install -y \
glibc-devel

# I need these lines because centos 7.9 has reached EOL
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo

# We'll compile and deploy a version of `gcc` in this stage.
FROM shared_components AS gcc_stage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(ENABLE_OPENMP OFF CACHE BOOL "" FORCE)

# CUDA options
set(ENABLE_CUDA ON CACHE BOOL "" FORCE)
set(CUDA_VERSION "11.7.1" CACHE PATH "")
set(CUDA_VERSION "12.4.0" CACHE PATH "")
set(CUDA_HOME "${SOFTWARE_ROOT}/cuda/${CUDA_VERSION}" CACHE PATH "")
set(CMAKE_CUDA_ARCHITECTURES "70" CACHE STRING "")
set(CUDA_ARCH "sm_${CMAKE_CUDA_ARCHITECTURES}" CACHE STRING "")
Expand Down
31 changes: 0 additions & 31 deletions docker/TotalEnergies/pecan-CPU.cmake

This file was deleted.

24 changes: 0 additions & 24 deletions docker/TotalEnergies/pecan-GPU.cmake

This file was deleted.

193 changes: 0 additions & 193 deletions docker/TotalEnergies/pecan.Dockerfile

This file was deleted.

Loading
Loading