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.

Sign up for GitHub

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

Update for Sherlock #256

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Update for Sherlock #256

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
632a52a
INSTALL_DIR_ROOT for Sherlock modified
matteofrigo5 Jan 26, 2024
12d5f9f
INSTALL_DIR_ROOT (GPU) for Sherlock modified
matteofrigo5 Jan 26, 2024
521abb5
INSTALL_DIR_ROOT modified and DOCKER_ROOT_IMAGE updated
matteofrigo5 Feb 2, 2024
bc99652
Merge branch 'master' into update-sherlock
TotoGaz Feb 3, 2024
524ec7d
host-config for Sherlock updated (disable openmp when cuda is enabled)
Feb 4, 2024
23c1499
DOCKER_ROOT_IMAGE updated
matteofrigo5 Feb 6, 2024
44c1314
Spaces removed
matteofrigo5 Feb 6, 2024
c23347e
Cuda Capability modified
matteofrigo5 Feb 9, 2024
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: 7 additions & 7 deletions .github/workflows/docker_build_tpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
- 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: jafranc/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.5.0-openblas0.3.10-zlib1.2.11-no-geosx:0.0.1
DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11-no-geosx:0.0.1
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
INSTALL_DIR_ROOT: /oak/stanford/schools/ees/COLLABORATIONS/geosx/CPU
- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10, zlib 1.2.11)
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.5.0-openblas0.3.10-zlib1.2.11
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU
- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, cuda 11.7.1, openblas 0.3.10, zlib 1.2.11)
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11
DOCKERFILE: docker/Stanford/Dockerfile
DOCKER_ROOT_IMAGE: jafranc/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.5.0-openblas0.3.10-zlib1.2.11-no-geosx:0.0.1
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.5.0-sm80.cmake
INSTALL_DIR_ROOT: /oak/stanford/schools/ees/COLLABORATIONS/geosx/GPU
DOCKER_ROOT_IMAGE: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11-no-geosx:0.0.1
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm80.cmake
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
- name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
DOCKERFILE: docker/gcc-ubuntu/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions docker/Stanford/Sherlock.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ 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.5.0
ARG CUDA_SUBVERSION=495.29.05
ARG CUDA_VERSION=11.7.1
ARG CUDA_SUBVERSION=515.65.01

# Main software root installation directory in SHERLOCK
ARG SHERLOCK_ROOT_INSTALL_DIR=/share/software/user/open
Expand Down
2 changes: 1 addition & 1 deletion ....1.2-openblas0.3.10-cuda11.5.0-sm80.cmake → ....1.2-openblas0.3.10-cuda11.7.1-sm80.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake)

# CUDA options
set(ENABLE_CUDA ON CACHE BOOL "" FORCE)
set(CUDA_VERSION "11.5.0" CACHE PATH "")
set(CUDA_VERSION "11.7.1" CACHE PATH "")
set(CUDA_HOME "${SOFTWARE_ROOT}/cuda/${CUDA_VERSION}" CACHE PATH "")
set(CMAKE_CUDA_ARCHITECTURES "80" CACHE STRING "")
set(CUDA_ARCH "sm_${CMAKE_CUDA_ARCHITECTURES}" CACHE STRING "")
Expand Down
Loading