From af697aa89d092db9a6a529a2a8801ee6f8e98851 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Mon, 22 Jul 2024 15:10:58 -0700 Subject: [PATCH] Try different cuda image built last night to see if it runs --- .github/workflows/build.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cd08af878..c0c51a703d 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, cuda12.3_debug, hip5.6, intel2024_sycl] + target: [gcc12, gcc13, clang13, clang14_debug, clang15, cuda11.8_debug, hip5.6, intel2024_sycl] runs-on: ubuntu-latest steps: - run: | diff --git a/Dockerfile b/Dockerfile index b306519617..7e98cccd7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,11 +55,11 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ ## make -j 16 &&\ ## ctest -T test --output-on-failure" -FROM ghcr.io/llnl/radiuss:ubuntu-22.04-cuda-12-3 AS cuda12.3_debug +FROM ghcr.io/llnl/radiuss:ubuntu-22.04-cuda-11-8 AS cuda11.8_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 -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 .. && \ +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 # TODO: We should switch to ROCm 6 -- size issues when creating image