From b9eb4a5351870ae83500bab3516862fbce45ffbd Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 23 Jul 2024 14:36:25 -0700 Subject: [PATCH] Move back to new cuda image --- .github/workflows/build.yml | 2 +- Dockerfile | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac2408c572..15dac20e7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ jobs: strategy: matrix: ## target: [gcc12, gcc13, clang13, clang14_debug, clang15, intel2024, cuda12.3_debug, hip5.6, intel2024_sycl] - target: [gcc12, gcc13, clang13, clang14_debug, clang15, cuda11.2, hip5.6, intel2024_sycl] + target: [gcc12, gcc13, clang13, clang14_debug, clang15, cuda12.3, hip5.6, intel2024_sycl] runs-on: ubuntu-latest steps: - run: | diff --git a/Dockerfile b/Dockerfile index a9adf6dc0f..4488552d13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,21 +57,21 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ ## Building with this image takes well over an hour if it completes. ## Often it fails because the build never starts. -##FROM ghcr.io/llnl/radiuss:ubuntu-22.04-cuda-12-3 AS cuda12.3_debug -##ENV GTEST_COLOR=1 -##COPY . /home/raja/workspace -##WORKDIR /home/raja/workspace/build -##RUN cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 .. && \ -## make -j 16 - -## Try an older rse-ops image.... -FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.2.2 AS cuda11.2 +FROM ghcr.io/llnl/radiuss:ubuntu-22.04-cuda-12-3 AS cuda12.3 ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build -RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \ - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \ - make -j 8 +RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc -DBLT_CXX_STD=c++14 -DCMAKE_CUDA_ARCHITECTURES=70 .. && \ + make -j 16 + +## Try an older rse-ops image.... +##FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.2.2 AS cuda11.2 +##ENV GTEST_COLOR=1 +##COPY . /home/raja/workspace +##WORKDIR /home/raja/workspace/build +##RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \ +## cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \ +## make -j 8 # TODO: We should switch to ROCm 6 -- size issues when creating image FROM ghcr.io/llnl/radiuss:hip-5.6.1-ubuntu-20.04 AS hip5.6