Skip to content

Commit 1511774

Browse files
committed
Remove intel check -- build error in OpenMP atomics, add SYCL check
1 parent 1332d05 commit 1511774

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build_docker:
55
strategy:
66
matrix:
7-
target: [gcc12, gcc13, clang13, clang14_debug, clang15, intel2024]
7+
target: [gcc12, gcc13, clang13, clang14_debug, clang15, intel2024_sycl]
88
runs-on: ubuntu-latest
99
steps:
1010
- run: |

Dockerfile

+14-14
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENM
4343
make -j 16 &&\
4444
ctest -T test --output-on-failure
4545

46-
FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024
47-
ENV GTEST_COLOR=1
48-
COPY . /home/raja/workspace
49-
WORKDIR /home/raja/workspace/build
50-
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
51-
cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On .. && \
52-
make -j 16"
46+
##FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024
47+
##ENV GTEST_COLOR=1
48+
##COPY . /home/raja/workspace
49+
##WORKDIR /home/raja/workspace/build
50+
##RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
51+
## cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On .. && \
52+
## make -j 16"
5353

5454
##FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
5555
##ENV GTEST_COLOR=1
@@ -88,10 +88,10 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
8888
## make -j 6 && \
8989
## cd .. && rm -rf build
9090

91-
##FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_sycl
92-
##ENV GTEST_COLOR=1
93-
##COPY . /home/raja/workspace
94-
##WORKDIR /home/raja/workspace/build
95-
##RUN bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
96-
## cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=dpcpp -DENABLE_OPENMP=Off -DRAJA_ENABLE_SYCL=On -DBLT_CXX_STD=c++17 .. && \
97-
## make -j 16"
91+
FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_sycl
92+
ENV GTEST_COLOR=1
93+
COPY . /home/raja/workspace
94+
WORKDIR /home/raja/workspace/build
95+
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
96+
cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=Off -DRAJA_ENABLE_SYCL=On -DBLT_CXX_STD=c++17 .. && \
97+
make -j 16"

0 commit comments

Comments
 (0)