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

update ci images #33

Merged
merged 23 commits into from
May 24, 2024
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
115 changes: 63 additions & 52 deletions .github/workflows/continuousIntegration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# runs-on: ubuntu-22.04
# steps:
# - name: Checkout Repository
# uses: actions/checkout@v3
# uses: actions/checkout@v4.1.6
# with:
# submodules: true
# lfs: false
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
submodules: true
lfs: false
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
submodules: true
lfs: false
Expand All @@ -67,129 +67,137 @@ jobs:

linux_builds:
name: ${{matrix.name}}
runs-on: ${{matrix.os}}
runs-on: ${{matrix.RUNS_ON}}
strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false
matrix:
include:
- name: RHEL8.8-clang15-dbg (ubi8.8, clang-15.0.7, Debug)
DOCKER_REPOSITORY: geosx/ubi:8.8-854
OS: ubuntu-22.04
- name: RHEL8.9-clang17-dbg (ubi8.9, clang-17.0.6, Debug)
DOCKER_REPOSITORY: geosx/ubi:8.9
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: clang++
CMAKE_C_COMPILER: clang
CMAKE_BUILD_TYPE: Debug

- name: RHEL8.8-clang15-rel (ubi8.8, clang-15.0.7, Release)
DOCKER_REPOSITORY: geosx/ubi:8.8-854
OS: ubuntu-22.04
- name: RHEL8.9-clang17-rel (ubi8.9, clang-17.0.6, Release)
DOCKER_REPOSITORY: geosx/ubi:8.9
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: clang++
CMAKE_C_COMPILER: clang
CMAKE_BUILD_TYPE: Release

- name: RHEL8.8-gcc12-dbg (ubi8.8, gcc 12.2.1, Debug)
DOCKER_REPOSITORY: geosx/ubi:8.8-854
OS: ubuntu-22.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-12/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-12/root/bin/gcc
- name: RHEL8.9-gcc13-dbg (ubi8.9, gcc 13.2.1, Debug)
DOCKER_REPOSITORY: geosx/ubi:8.9
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
CMAKE_BUILD_TYPE: Debug

- name: RHEL8.8-gcc12-rel (ubi8.8, gcc 12.2.1, Release)
DOCKER_REPOSITORY: geosx/ubi:8.8-854
OS: ubuntu-22.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-12/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-12/root/bin/gcc
- name: RHEL8.9-gcc13-rel (ubi8.9, gcc 13.2.1, Release)
DOCKER_REPOSITORY: geosx/ubi:8.9
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
CMAKE_BUILD_TYPE: Release

- name: ubuntu22-gcc11-rel (ubuntu-22, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
OS: ubuntu-22.04
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Release
BUILD_AND_TEST_ARGS: "--disable-unit-tests"

- name: ubuntu22-clang14-rel (ubuntu-22, clang-14.0.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
OS: ubuntu-22.04
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Release
BUILD_AND_TEST_ARGS: "--disable-unit-tests"

- name: ubuntu22-clang14-dbg (ubuntu-22, clang-14.0.0, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
OS: ubuntu-22.04
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Debug
BUILD_AND_TEST_ARGS: "--disable-unit-tests"

- name: ubuntu22-gcc11-dbg (ubuntu-22, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
OS: ubuntu-22.04
RUNS_ON: ubuntu-22.04
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Debug
BUILD_AND_TEST_ARGS: "--disable-unit-tests"

- name: ubuntu22-gcc11-cuda11-rel (ubuntu-22, gcc 11.4.0, cuda-11.8.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8.0
OS: ubuntu-22.04
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

- name: ubuntu22-gcc11-cuda11-dbg (ubuntu-22, gcc 11.4.0, cuda-11.8.0, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8.0
OS: ubuntu-22.04
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Debug
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

- name: ubuntu22-clang14-cuda11-rel (ubuntu-22, clang-14.0.0, cuda-11.8.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8.0
OS: ubuntu-22.04
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

- name: ubuntu22-clang14-cuda11-dbg (ubuntu-22, clang-14.0.0, cuda-11.8.0, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8.0
OS: ubuntu-22.04
DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Debug
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

- name: RHEL8.8-clang15-cuda12-rel (ubi8.8, clang-15.0.7, cuda-12.2.2, Release)
DOCKER_REPOSITORY: geosx/ubi:8.8-cuda12.2.2
OS: ubuntu-22.04
- name: RHEL8.9-clang17-cuda12-rel (ubi8.9, clang-17.0.6, cuda-12.4.1, Release)
DOCKER_REPOSITORY: geosx/ubi:8.9-cuda12.4.1
RUNS_ON: streak2
CMAKE_CXX_COMPILER: clang++
CMAKE_C_COMPILER: clang
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

- name: RHEL8.8-gcc12-cuda12-rel (ubi8.8, gcc 12.2.1, cuda-12.2.2, Release)
DOCKER_REPOSITORY: geosx/ubi:8.8-cuda12.2.2
OS: ubuntu-22.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-12/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-12/root/bin/gcc
- name: RHEL8.9-gcc13-cuda12-rel (ubi8.8, gcc 13.2.1, cuda-12.4.1, Release)
DOCKER_REPOSITORY: geosx/ubi:8.9-cuda12.4.1
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
BUILD_AND_TEST_ARGS: "--disable-unit-tests"
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
submodules: true
lfs: false
Expand All @@ -204,7 +212,10 @@ jobs:
CMAKE_C_COMPILER: ${{ matrix.CMAKE_C_COMPILER }}
CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }}
ENABLE_CUDA: ${{ matrix.ENABLE_CUDA }}
CMAKE_CUDA_ARCHITECTURES: ${{ matrix.CMAKE_CUDA_ARCHITECTURES }}
NPROC: ${{ matrix.NPROC }}
BUILD_AND_TEST_ARGS: ${{ matrix.BUILD_AND_TEST_ARGS }} --build-exe
DOCKER_RUN_ARGS: ${{ matrix.DOCKER_RUN_ARGS }}
HOST_CONFIG: hostconfigs/environment.cmake
run: ./scripts/ci_build_and_test.sh

Expand All @@ -214,7 +225,7 @@ jobs:
# - linux_builds
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.6
with:
submodules: true
lfs: false
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "cmake/blt"]
path = cmake/blt
url = [email protected]:LLNL/blt.git
url = ../../LLNL/blt.git
[submodule "tpl/camp"]
path = tpl/camp
url = [email protected]:LLNL/camp.git
url = ../../LLNL/camp.git
2 changes: 1 addition & 1 deletion cmake/blt
Submodule blt updated 150 files
6 changes: 3 additions & 3 deletions docker/buildAndPush.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@



images="ubuntu:22.04 ubuntu-cuda11:22.04-cuda11.8.0 ubi:8.8-854 ubi-cuda11:8.8-cuda11.8.0 ubi-cuda12:8.8-cuda12.2.2"
images="ubuntu:22.04 ubuntu-cuda11:22.04-cuda11.8 ubi:8.9 ubi-cuda11:8.8-cuda11.8 ubi-cuda12:8.9-cuda12.4.1"

for image in $images; do
imagePart=(${image//:/ })
Expand All @@ -20,6 +20,6 @@ for image in $images; do
echo


docker build ${dir} -t ${repo}
docker push ${repo}
# docker build ${dir} -t ${repo}
# docker push ${repo}
done
4 changes: 2 additions & 2 deletions docker/ubi-cuda11/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG TMP_DIR=/tmp
FROM nvidia/cuda:11.8.0-devel-ubi8 AS ubi8-cuda11
FROM nvidia/cuda:11.8.0-devel-ubi8 AS ubi8.8-cuda11


# install required packages
Expand All @@ -12,5 +12,5 @@ RUN yum install -y \
python3

# Installing latest CMake version available on Lassen
ARG CMAKE_VERSION=3.23.5
ARG CMAKE_VERSION=3.28.5
RUN curl -fsSL -k https://cmake.org/files/v${CMAKE_VERSION%.[0-9]*}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -
4 changes: 2 additions & 2 deletions docker/ubi-cuda12/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG TMP_DIR=/tmp
FROM nvidia/cuda:12.2.2-devel-ubi8 AS ubi8-cuda12
FROM nvidia/cuda:12.4.1-devel-ubi8 AS ubi8.9-cuda12


# install required packages
Expand All @@ -12,6 +12,6 @@ RUN yum install -y \
python3

# Installing latest CMake version available on Lassen
ARG CMAKE_VERSION=3.23.5
ARG CMAKE_VERSION=3.28.5
RUN curl -fsSL -k https://cmake.org/files/v${CMAKE_VERSION%.[0-9]*}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -

4 changes: 2 additions & 2 deletions docker/ubi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM redhat/ubi8:8.8-854 AS ubi8
FROM redhat/ubi8:8.9 AS ubi8.9


# install required packages
Expand All @@ -10,5 +10,5 @@ RUN yum install -y \
clang-tools-extra \
python3

ARG CMAKE_VERSION=3.23.5
ARG CMAKE_VERSION=3.28.5
RUN curl -fsSL -k https://cmake.org/files/v${CMAKE_VERSION%.[0-9]*}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -
2 changes: 1 addition & 1 deletion docker/ubuntu-cuda11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime && \
cppcheck \
clang-tidy

ARG CMAKE_VERSION=3.23.5
ARG CMAKE_VERSION=3.28.5
RUN curl -fsSL -k https://cmake.org/files/v${CMAKE_VERSION%.[0-9]*}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -
4 changes: 2 additions & 2 deletions docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime && \
clang-tidy \
lcov

ARG CMAKE_VERSION=3.23.5
ARG CMAKE_VERSION=3.28.5
RUN curl -fsSL -k https://cmake.org/files/v${CMAKE_VERSION%.[0-9]*}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -

ARG DOXYGEN_VERSION=1.9.8
ARG DOXYGEN_VERSION=1.11.0
RUN curl -fsSL -k https://www.doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz | tar --directory=/usr/local --strip-components=1 -xzf -
Loading
Loading