Skip to content

Commit a55a9c5

Browse files
committed
Add intel and intel-sycl checks
1 parent 2d506e2 commit a55a9c5

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
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]
7+
target: [gcc12, gcc13, clang13, clang14_debug, clang15, intel2024, intel2024_sycl]
88
runs-on: ubuntu-latest
99
steps:
1010
- run: |

Dockerfile

+31-33
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,50 @@ FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-12 AS gcc12
77
ENV GTEST_COLOR=1
88
COPY . /home/raja/workspace
99
WORKDIR /home/raja/workspace/build
10-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
11-
make -j 6 &&\
10+
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
11+
make -j 16 &&\
1212
ctest -T test --output-on-failure
1313

1414
FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS gcc13
1515
ENV GTEST_COLOR=1
1616
COPY . /home/raja/workspace
1717
WORKDIR /home/raja/workspace/build
18-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
19-
make -j 6 &&\
18+
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
19+
make -j 16 &&\
2020
ctest -T test --output-on-failure
2121

22-
FROM ghcr.io/rse-ops/clang-ubuntu-22.04:llvm-13.0.0 AS clang13
22+
FROM ghcr.io/llnl/radiuss:clang-13-ubuntu-22.04 AS clang13
2323
ENV GTEST_COLOR=1
2424
COPY . /home/raja/workspace
2525
WORKDIR /home/raja/workspace/build
26-
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
27-
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Release .. && \
28-
make -j 6 &&\
26+
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
27+
make -j 16 &&\
2928
ctest -T test --output-on-failure
3029

3130
FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14_debug
3231
ENV GTEST_COLOR=1
3332
COPY . /home/raja/workspace
3433
WORKDIR /home/raja/workspace/build
35-
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=On .. && \
36-
make -j 6 &&\
34+
RUN cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
35+
make -j 16 &&\
3736
ctest -T test --output-on-failure
3837

39-
#FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14
40-
#ENV GTEST_COLOR=1
41-
#COPY . /home/raja/workspace
42-
#WORKDIR /home/raja/workspace/build
43-
#RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
44-
# make -j 6 &&\
45-
# ctest -T test --output-on-failure
38+
FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15
39+
ENV GTEST_COLOR=1
40+
COPY . /home/raja/workspace
41+
WORKDIR /home/raja/workspace/build
42+
RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
43+
make -j 16 &&\
44+
ctest -T test --output-on-failure
4645

47-
## TODO: Figure out why OpenMP does not work here....
48-
#FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15
49-
#ENV GTEST_COLOR=1
50-
#COPY . /home/raja/workspace
51-
#WORKDIR /home/raja/workspace/build
52-
#RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_OPENMP=On .. && \
53-
# make -j 6 &&\
54-
# ctest -T test --output-on-failure
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_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=icpx -DENABLE_OPENMP=On .. && \
52+
make -j 8 &&\
53+
ctest -T test --output-on-failure"
5554

5655
##FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
5756
##ENV GTEST_COLOR=1
@@ -90,11 +89,10 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=
9089
## make -j 6 && \
9190
## cd .. && rm -rf build
9291

93-
#FROM ghcr.io/rse-ops/intel-ubuntu-22.04:intel-2023.2.1 AS sycl
94-
#ENV GTEST_COLOR=1
95-
#COPY . /home/raja/workspace
96-
#WORKDIR /home/raja/workspace/build
97-
#RUN /bin/bash -c "source /opt/view/setvars.sh && \
98-
# cmake -DCMAKE_CXX_COMPILER=dpcpp -DRAJA_ENABLE_SYCL=On -DENABLE_OPENMP=Off -DENABLE_ALL_WARNINGS=Off -DBLT_CXX_STD=c++17 .. && \
99-
# make -j 6" && \
100-
# cd .. && rm -rf build
92+
FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_sycl
93+
ENV GTEST_COLOR=1
94+
COPY . /home/raja/workspace
95+
WORKDIR /home/raja/workspace/build
96+
RUN bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \
97+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=dpcpp -DENABLE_OPENMP=Off -DRAJA_ENABLE_SYCL=On -DBLT_CXX_STD=c++17 .. && \
98+
make -j 16"

0 commit comments

Comments
 (0)