Skip to content

Commit

Permalink
CI cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
rhornung67 committed Aug 14, 2024
1 parent 3af08e6 commit 5c38a94
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
build_docker:
strategy:
matrix:
target: [gcc12, gcc13, clang13, clang15, rocm6.0, rocm6.0_desul, intel2024, intel2024_debug, intel2024_sycl]
target: [gcc12, gcc13, clang13, clang15, rocm5.6, rocm5.6_desul, intel2024, intel2024_debug, intel2024_sycl]
runs-on: ubuntu-latest
steps:
- run: |
Expand Down Expand Up @@ -72,15 +72,3 @@ jobs:
- uses: threeal/[email protected]
with:
build-config: Debug
## ====================================
## Attempt to run tests by invoking ctest manually.
## Generates errors similar to above -- cannot find test executables.
## - name: Test
## working-directory: ${{github.workspace}}/build
## run: ctest -C Release --output-on-failure
## ====================================
## Another attempt.
## This produces no errors, but test executables are not found.
## - name: Run Tests
## run: ctest.exe -C Release
## shell: bash
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
make -j 16 &&\
make -j 6 &&\
ctest -T test --output-on-failure

FROM ghcr.io/llnl/radiuss:gcc-12-ubuntu-22.04 AS gcc12
Expand Down Expand Up @@ -80,7 +80,7 @@ ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On .. && \
make -j 16 &&\
make -j 6 &&\
ctest -T test --output-on-failure

## Test run failure in RAJA launch tests with new reducer interface.
Expand Down Expand Up @@ -129,6 +129,7 @@ WORKDIR /home/raja/workspace/build
RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-5.6.1/bin/amdclang++ -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \
make -j 6

## ROCm 6 image is broken
FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6.0
ENV GTEST_COLOR=1
ENV HCC_AMDGPU_TARGET=gfx900
Expand All @@ -137,6 +138,7 @@ WORKDIR /home/raja/workspace/build
RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.0.2/bin/amdclang++ -DENABLE_HIP=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \
make -j 6

## ROCm 6 image is broken
FROM ghcr.io/llnl/radiuss:hip-6.0.2-ubuntu-20.04 AS rocm6.0_desul
ENV GTEST_COLOR=1
ENV HCC_AMDGPU_TARGET=gfx900
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
timeoutInMinutes: 360
strategy:
matrix:
gcc11:
docker_target: gcc11
gcc12_debug:
docker_target: gcc12_debug
gcc12_desul:
Expand Down

0 comments on commit 5c38a94

Please sign in to comment.