From 23c14997f41c4c783bbdec27d349a13f23ea67a6 Mon Sep 17 00:00:00 2001 From: mfrigo Date: Mon, 5 Feb 2024 17:58:46 -0800 Subject: [PATCH] DOCKER_ROOT_IMAGE updated --- .github/workflows/docker_build_tpls.yml | 4 ++-- docker/Stanford/Sherlock.Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker_build_tpls.yml b/.github/workflows/docker_build_tpls.yml index e1060547..0a6da063 100644 --- a/.github/workflows/docker_build_tpls.yml +++ b/.github/workflows/docker_build_tpls.yml @@ -40,13 +40,13 @@ 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: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-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.2 HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake 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: matteofrigo5/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-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.2 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) diff --git a/docker/Stanford/Sherlock.Dockerfile b/docker/Stanford/Sherlock.Dockerfile index faf7f8f2..8dfa9e16 100644 --- a/docker/Stanford/Sherlock.Dockerfile +++ b/docker/Stanford/Sherlock.Dockerfile @@ -182,6 +182,6 @@ ENV CC=${SHERLOCK_GCC_INSTALL_DIR}/bin/gcc \ MPIFC=${SHERLOCK_OPENMPI_INSTALL_DIR}/bin/mpifort \ MPIEXEC=${SHERLOCK_OPENMPI_INSTALL_DIR}/bin/mpiexec \ # An additional `LD_LIBRARY_PATH` action is needed for the tools to work. - LD_LIBRARY_PATH=${SHERLOCK_OPENMPI_INSTALL_DIR}/lib:${SHERLOCK_GCC_INSTALL_DIR}/lib64:${SHERLOCK_OPENBLAS_INSTALL_DIR}/lib:${SHERLOCK_ZLIB_INSTALL_DIR}/lib:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${SHERLOCK_OPENMPI_INSTALL_DIR}/lib:${SHERLOCK_GCC_INSTALL_DIR}/lib64:${SHERLOCK_OPENBLAS_INSTALL_DIR}/lib:${SHERLOCK_CUDA_INSTALL_DIR}/lib64:${SHERLOCK_ZLIB_INSTALL_DIR}/lib:${LD_ LIBRARY_PATH}