Skip to content

Commit 46e3afe

Browse files
bmhan12bmhan12
committed
Cleanup, run whole
1 parent fb306a2 commit 46e3afe

2 files changed

Lines changed: 35 additions & 38 deletions

File tree

‎.github/workflows/docker_build_tpls.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@ jobs:
2020

2121
matrix:
2222
include:
23-
# - name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
24-
# DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3
25-
# DOCKERFILE: docker/TotalEnergies/Dockerfile
26-
# DOCKER_ROOT_IMAGE: totogaz/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3-no-geosx:0.0.1
27-
# INSTALL_DIR_ROOT: /workrd/SCR/GEOSX/install/gcc8
28-
# - name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119)
29-
# DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119
30-
# DOCKERFILE: docker/TotalEnergies/Dockerfile
31-
# DOCKER_ROOT_IMAGE: totogaz/pecan-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119-no-geosx:0.0.1
32-
# HOST_CONFIG: docker/TotalEnergies/pecan-GPU.cmake
33-
# INSTALL_DIR_ROOT: /shared/data1/Users/j0436735/travis-deployments/GPU
34-
# - name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
35-
# DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
36-
# DOCKERFILE: docker/TotalEnergies/Dockerfile
37-
# DOCKER_ROOT_IMAGE: totogaz/pecan-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119-no-geosx:0.0.1
38-
# HOST_CONFIG: docker/TotalEnergies/pecan-CPU.cmake
39-
# INSTALL_DIR_ROOT: /shared/data1/Users/j0436735/travis-deployments/CPU
40-
# - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11)
41-
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
42-
# DOCKERFILE: docker/Stanford/Dockerfile
43-
# 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
44-
# HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
45-
# INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU
46-
# - 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)
47-
# DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11
48-
# DOCKERFILE: docker/Stanford/Dockerfile
49-
# 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
50-
# HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake
51-
# INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
23+
- name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
24+
DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3
25+
DOCKERFILE: docker/TotalEnergies/Dockerfile
26+
DOCKER_ROOT_IMAGE: totogaz/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3-no-geosx:0.0.1
27+
INSTALL_DIR_ROOT: /workrd/SCR/GEOSX/install/gcc8
28+
- name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119)
29+
DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119
30+
DOCKERFILE: docker/TotalEnergies/Dockerfile
31+
DOCKER_ROOT_IMAGE: totogaz/pecan-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119-no-geosx:0.0.1
32+
HOST_CONFIG: docker/TotalEnergies/pecan-GPU.cmake
33+
INSTALL_DIR_ROOT: /shared/data1/Users/j0436735/travis-deployments/GPU
34+
- name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
35+
DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
36+
DOCKERFILE: docker/TotalEnergies/Dockerfile
37+
DOCKER_ROOT_IMAGE: totogaz/pecan-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119-no-geosx:0.0.1
38+
HOST_CONFIG: docker/TotalEnergies/pecan-CPU.cmake
39+
INSTALL_DIR_ROOT: /shared/data1/Users/j0436735/travis-deployments/CPU
40+
- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, zlib 1.2.11)
41+
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
42+
DOCKERFILE: docker/Stanford/Dockerfile
43+
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
44+
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake
45+
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/CPU
46+
- 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)
47+
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-cuda11.7.1-openblas0.3.10-zlib1.2.11
48+
DOCKERFILE: docker/Stanford/Dockerfile
49+
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
50+
HOST_CONFIG: docker/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake
51+
INSTALL_DIR_ROOT: /oak/stanford/groups/tchelepi/geos-sherlock/GPU
5252
- name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
5353
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
5454
DOCKERFILE: docker/gcc-ubuntu/Dockerfile
@@ -69,12 +69,12 @@ jobs:
6969
DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12
7070
DOCKERFILE: docker/gcc-ubuntu/Dockerfile
7171
DOCKER_COMPILER_BUILD_ARG: "--build-arg GCC_MAJOR_VERSION=12"
72-
# - name: Ubuntu (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89)
73-
# DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89
74-
# DOCKERFILE: docker/clang-cuda/Dockerfile
75-
# - name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
76-
# DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89
77-
# DOCKERFILE: docker/gcc-cuda/Dockerfile
72+
- name: Ubuntu (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89)
73+
DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89
74+
DOCKERFILE: docker/clang-cuda/Dockerfile
75+
- name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
76+
DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89
77+
DOCKERFILE: docker/gcc-cuda/Dockerfile
7878

7979
steps:
8080
- name: Checkout

‎docker/gcc-ubuntu/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
4444
# is not in the python-minimal package so we install the whole std lib.
4545
python3
4646

47-
4847
# Installing more recent cmake version (3.10.2 in ubuntu is not enough)
4948
ARG CMAKE_VERSION=3.23.1
5049
# We install (and uninstall) `curl` and some SSL certificates only for downloading `cmake`.
@@ -136,8 +135,6 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
136135
python3-venv \
137136
python3-pytest
138137

139-
140-
141138
# Install `sccache` binaries to speed up the build of `geos`.
142139
RUN apt-get install -y --no-install-recommends curl && \
143140
mkdir -p /opt/sccache/bin && \

0 commit comments

Comments
 (0)