Skip to content

Commit 1fc8ac3

Browse files
authored
Merge branch 'develop' into artv3/zeroTo
2 parents ad5f132 + c2573cb commit 1fc8ac3

59 files changed

Lines changed: 1476 additions & 1279 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
build-dir: build
3232
options:
33-
CMAKE_CXX_STANDARD=17
33+
CMAKE_CXX_STANDARD=20
3434
ENABLE_OPENMP=Off
3535
CMAKE_BUILD_TYPE=Release
3636
run-build: true
@@ -57,8 +57,8 @@ jobs:
5757
build-dir: build
5858
options:
5959
ENABLE_WARNINGS_AS_ERRORS=Off
60-
BLT_CXX_STD=""
61-
CMAKE_CXX_STANDARD=17
60+
BLT_CXX_STD="c++20"
61+
CMAKE_CXX_STANDARD=20
6262
CMAKE_BUILD_TYPE=Release
6363
${{ matrix.shared.args }}
6464
run-build: true

.gitlab/custom-variables.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,42 @@ variables:
2020
ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
2121

2222
# Dane (SLURM) allocation settings
23-
DANE_SHARED_ALLOC: "--exclusive --reservation=ci --time=120 --nodes=1"
23+
DANE_SHARED_ALLOC: "OFF"
2424
# Note: we repeat the reservation, helpful when jobs are manually re-triggered.
25-
DANE_JOB_ALLOC: "--reservation=ci --nodes=1"
25+
DANE_JOB_ALLOC: "--reservation=ci --exclusive=user --time=10 --nodes=1"
2626
# Project specific variants for dane
2727
PROJECT_DANE_VARIANTS: "~shared +openmp +vectorization +tests"
2828
# Project specific deps for dane
2929
PROJECT_DANE_DEPS: ""
3030

3131
# Matrix (SLURM) allocation settings
32-
MATRIX_SHARED_ALLOC: "--exclusive --partition=pci --time=60 --nodes=1"
32+
MATRIX_SHARED_ALLOC: "OFF"
3333
# Note: we repeat the reservation, helpful when jobs are manually re-triggered.
34-
MATRIX_JOB_ALLOC: "--partition=pci --nodes=1"
34+
MATRIX_JOB_ALLOC: "--partition=pci --exclusive=user --time=20 --nodes=1"
3535
# Project specific variants for matrix
3636
PROJECT_MATRIX_VARIANTS: "~shared +cuda cuda_arch=90 +tests"
3737
# Project specific deps for matrix
3838
PROJECT_MATRIX_DEPS: ""
3939

4040
# Corona (flux) allocation settings
41-
CORONA_SHARED_ALLOC: "--exclusive --time-limit=60m --nodes=1 -o per-resource.count=2"
42-
CORONA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
41+
CORONA_SHARED_ALLOC: "OFF"
42+
CORONA_JOB_ALLOC: "--nodes=1 --time-limit=30m --begin-time=+5s"
4343
# Project specific variants for corona
4444
PROJECT_CORONA_VARIANTS: "~shared ~openmp +vectorization +tests"
4545
# Project specific deps for corona
4646
PROJECT_CORONA_DEPS: ""
4747

4848
# Tioga (flux) allocation settings
49-
TIOGA_SHARED_ALLOC: "--exclusive --queue=pci --time-limit=70m --nodes=1 -o per-resource.count=2"
50-
TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
49+
TIOGA_SHARED_ALLOC: "OFF"
50+
TIOGA_JOB_ALLOC: "--queue=pci --nodes=1 --time-limit=30m --begin-time=+5s"
5151
# Project specific variants for tioga
5252
PROJECT_TIOGA_VARIANTS: "~shared +openmp +vectorization +tests"
5353
# Project specific deps for tioga
5454
PROJECT_TIOGA_DEPS: ""
5555

5656
# Tuolumne (flux) allocation settings
57-
TUOLUMNE_SHARED_ALLOC: "--exclusive --queue=pci --time-limit=90m --nodes=1 -o per-resource.count=2"
58-
TUOLUMNE_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
57+
TUOLUMNE_SHARED_ALLOC: "OFF"
58+
TUOLUMNE_JOB_ALLOC: "--queue=pci --nodes=1 --time-limit=45m --begin-time=+5s"
5959
# Project specific variants for tuolumne
6060
PROJECT_TUOLUMNE_VARIANTS: "~shared +openmp +vectorization +tests"
6161
# Project specific deps for tuolumne

.gitlab/jobs/matrix.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ clang_18_1_8_gcc_13_cuda_12_6_0:
3232
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
3333
# describe the spec here.
3434

35-
# clang_18_1_8_cuda_12_6_0
3635
clang_18_1_8_cuda_12_6_0:
3736
variables:
38-
SPEC: " ~shared +cuda cuda_arch=90 %llvm@=18.1.8 ^cuda@12.6.0+allow-unsupported-compilers"
37+
SPEC: " ~shared +cuda cuda_arch=90 +tests %llvm@=18.1.8 ^cuda@12.6.0+allow-unsupported-compilers"
3938
extends: .job_on_matrix
40-
allow_failure: true
41-

.gitlab/jobs/tioga.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
# project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
2020
# So that the comparison with the original job is easier.
2121

22-
## NOTE: rocm 6.4.1 job is in the shared RSC set of jobs
22+
## NOTE: rocm 6.4.3 job is in the shared RSC set of jobs
2323

24-
## NOTE: cce 20.0.0 job is in the shared RSC set of jobs
24+
## NOTE: rocm 7.2.0 job is in the shared RSC set of jobs
25+
26+
## NOTE: cce 21.0.0 job is in the shared RSC set of jobs
2527

2628
############
2729
# Extra jobs
@@ -30,20 +32,20 @@
3032
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
3133
# describe the spec here.
3234

33-
rocmcc_6_4_1_hip_desul_atomics:
35+
rocmcc_6_4_3_hip_desul_atomics:
3436
variables:
35-
SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^hip@6.4.1"
37+
SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.3 ^hip@6.4.3"
3638
extends: .job_on_tioga
3739

38-
rocmcc_6_4_1_hip_openmp:
40+
rocmcc_6_4_3_hip_openmp:
3941
variables:
40-
SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^hip@6.4.1"
42+
SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.3 ^hip@6.4.3"
4143
extends: .job_on_tioga
4244

43-
rocmcc_6_4_1_hip_jit_proteus:
45+
rocmcc_6_4_3_hip_jit_proteus:
4446
variables:
45-
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^hip@6.4.1 ${PROJECT_TIOGA_DEPS}"
46-
CMAKE_EXTRA_ARGS: "-DBUILD_SHARED=ON -DRAJA_ENABLE_JIT=ON -DLLVM_INSTALL_DIR=/opt/rocm-6.4.1/llvm"
47+
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %llvm-amdgpu@=6.4.3 ^hip@6.4.3 ${PROJECT_TIOGA_DEPS}"
48+
CMAKE_EXTRA_ARGS: "-DBUILD_SHARED=ON -DRAJA_ENABLE_JIT=ON -DLLVM_INSTALL_DIR=/opt/rocm-6.4.3/llvm"
4749
CTEST_REGEX: "forall.*Hip|kernel.*Hip|launch.*Hip"
4850
CTEST_JOBS: "16"
4951
extends: .job_on_tioga

.gitlab/jobs/tuolumne.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
# project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
2020
# So that the comparison with the original job is easier.
2121

22-
## cce 20.0.0 job is in the shared RSC set of jobs
22+
## NOTE: rocm 6.4.3 job is in the shared RSC set of jobs
2323

24-
## rocm 6.4.1 job is in the shared RSC set of jobs
24+
## NOTE: rocm 7.2.0 job is in the shared RSC set of jobs
25+
26+
## NOTE: cce 21.0.0 job is in the shared RSC set of jobs
2527

2628
############
2729
# Extra jobs
@@ -30,12 +32,12 @@
3032
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
3133
# describe the spec here.
3234

33-
rocmcc_6_4_1_hip_desul_atomics:
35+
rocmcc_6_4_3_hip_desul_atomics:
3436
variables:
35-
SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.1 ^hip@6.4.1"
37+
SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.3 ^hip@6.4.3"
3638
extends: .job_on_tuolumne
3739

38-
rocmcc_6_4_1_hip_openmp:
40+
rocmcc_6_4_3_hip_openmp:
3941
variables:
40-
SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.1 ^hip@6.4.1"
42+
SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.3 ^hip@6.4.3"
4143
extends: .job_on_tuolumne

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ matrix:
3434
env:
3535
- COMPILER=/opt/intel/bin/icpc
3636
- IMG=icc18
37-
- CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_FORCEINLINE_RECURSIVE=Off -DRAJA_ENABLE_TBB=On -DBLT_CXX_STD=c++17"
37+
- CMAKE_EXTRA_FLAGS="-DRAJA_ENABLE_FORCEINLINE_RECURSIVE=Off -DRAJA_ENABLE_TBB=On -DBLT_CXX_STD=c++20"
3838
- compiler: nvcc10.2
3939
env:
4040
- COMPILER=g++

.uberenv_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"package_final_phase" : "initconfig",
55
"package_source_dir" : "../..",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_branch": "v1.1.0",
7+
"spack_branch": "v1.1.1",
88
"spack_configs_path": "scripts/radiuss-spack-configs",
99
"spack_packages_path": "scripts/radiuss-spack-configs/spack_repo/llnl_radiuss/packages",
1010
"spack_setup_clingo": false

CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@ if(NOT DEFINED BLT_CXX_STD)
5757
if("cxx_std_20" IN_LIST CMAKE_CXX_KNOWN_FEATURES)
5858
set(BLT_CXX_STD c++20 CACHE STRING "Version of C++ standard")
5959
message("Using C++ standard: ${BLT_CXX_STD}")
60-
elseif("cxx_std_17" IN_LIST CMAKE_CXX_KNOWN_FEATURES)
61-
set(BLT_CXX_STD c++17 CACHE STRING "Version of C++ standard")
62-
message("Using C++ standard: ${BLT_CXX_STD}")
6360
elseif("${CMAKE_CXX_COMPILER_ID}" IN_LIST COMPILERS_KNOWN_TO_CMAKE33)
64-
set(BLT_CXX_STD c++17 CACHE STRING "Version of C++ standard")
61+
set(BLT_CXX_STD c++20 CACHE STRING "Version of C++ standard")
6562
message("Using C++ standard: ${BLT_CXX_STD}")
6663
else() #cmake has no idea what to do, do it ourselves...
67-
set(flag_var "c++17")
64+
set(flag_var "c++20")
6865
CHECK_CXX_COMPILER_FLAG("-std=${flag_var}" COMPILER_SUPPORTS_${flag_var})
6966
if(COMPILER_SUPPORTS_${flag_var})
7067
set(BLT_CXX_STD ${flag_var} CACHE STRING "Version of C++ standard")
@@ -75,11 +72,20 @@ if(NOT DEFINED BLT_CXX_STD)
7572
else() #check BLT_CXX_STD is high enough by disallowing the only invalid option
7673
if(("${BLT_CXX_STD}" STREQUAL "c++98") OR
7774
("${BLT_CXX_STD}" STREQUAL "c++11") OR
78-
("${BLT_CXX_STD}" STREQUAL "c++14"))
79-
message(FATAL_ERROR "RAJA requires minimum C++ standard of c++17")
75+
("${BLT_CXX_STD}" STREQUAL "c++14") OR
76+
("${BLT_CXX_STD}" STREQUAL "c++17"))
77+
message(FATAL_ERROR "RAJA requires minimum C++ standard of c++20")
8078
endif()
8179
endif(NOT DEFINED BLT_CXX_STD)
8280

81+
set(RAJA_MIN_CXX_STANDARD 20)
82+
83+
if(DEFINED CMAKE_CXX_STANDARD
84+
AND NOT CMAKE_CXX_STANDARD STREQUAL ""
85+
AND ((CMAKE_CXX_STANDARD LESS RAJA_MIN_CXX_STANDARD) OR (CMAKE_CXX_STANDARD EQUAL 98)) )
86+
message(FATAL_ERROR "RAJA requires minimum C++ standard of C++${RAJA_MIN_CXX_STANDARD}")
87+
endif()
88+
8389
set(CMAKE_CXX_EXTENSIONS OFF)
8490

8591
if (NOT BLT_LOADED)

Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
###############################################################################
99

1010
##
11-
## Note that we build with 'make -j 16' for newer targets and 'make -j 6'
12-
## for older targets on GitHub Actions. This is reflected in the 'make'
11+
## Note that we build with 'make -j 16' for newer targets and 'make -j 6'
12+
## for older targets on GitHub Actions. This is reflected in the 'make'
1313
## commands below. This seems to work best for throughput.
1414
##
1515

1616
FROM ghcr.io/llnl/radiuss:ubuntu-24.04-gcc-12 AS gcc12
1717
ENV GTEST_COLOR=1
1818
COPY . /home/raja/workspace
1919
WORKDIR /home/raja/workspace/build
20-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
20+
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
2121
make -j 16 &&\
2222
ctest -T test --output-on-failure && \
2323
make clean
@@ -26,7 +26,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-gcc-12 AS gcc12_debug
2626
ENV GTEST_COLOR=1
2727
COPY . /home/raja/workspace
2828
WORKDIR /home/raja/workspace/build
29-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
29+
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
3030
make -j 16 &&\
3131
ctest -T test --output-on-failure && \
3232
make clean
@@ -35,7 +35,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-gcc-13 AS gcc13
3535
ENV GTEST_COLOR=1
3636
COPY . /home/raja/workspace
3737
WORKDIR /home/raja/workspace/build
38-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
38+
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
3939
make -j 16 &&\
4040
ctest -T test --output-on-failure && \
4141
make clean
@@ -44,7 +44,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-gcc-13 AS gcc13_desul
4444
ENV GTEST_COLOR=1
4545
COPY . /home/raja/workspace
4646
WORKDIR /home/raja/workspace/build
47-
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++17 .. && \
47+
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++20 .. && \
4848
make -j 16 &&\
4949
ctest -T test --output-on-failure && \
5050
make clean
@@ -53,7 +53,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-clang-19 AS clang19_debug
5353
ENV GTEST_COLOR=1
5454
COPY . /home/raja/workspace
5555
WORKDIR /home/raja/workspace/build
56-
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
56+
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
5757
make -j 16 &&\
5858
ctest -T test --output-on-failure && \
5959
make clean
@@ -64,14 +64,14 @@ ENV GTEST_COLOR=1
6464
COPY . /home/raja/workspace
6565
WORKDIR /home/raja/workspace/build
6666
RUN clang-format --version && \
67-
cmake -DENABLE_CLANGFORMAT=ON ../ && \
67+
cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_CLANGFORMAT=ON ../ && \
6868
make check
6969

7070
FROM ghcr.io/llnl/radiuss:ubuntu-24.04-clang-19 AS clang19_desul
7171
ENV GTEST_COLOR=1
7272
COPY . /home/raja/workspace
7373
WORKDIR /home/raja/workspace/build
74-
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++17 .. && \
74+
RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++20 .. && \
7575
make -j 16 &&\
7676
ctest -T test --output-on-failure && \
7777
make clean
@@ -81,7 +81,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2
8181
ENV GTEST_COLOR=1
8282
COPY . /home/raja/workspace
8383
WORKDIR /home/raja/workspace/build
84-
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
84+
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
8585
make -j 16 &&\
8686
make clean"
8787

@@ -90,15 +90,15 @@ FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2_debug
9090
ENV GTEST_COLOR=1
9191
COPY . /home/raja/workspace
9292
WORKDIR /home/raja/workspace/build
93-
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=On -DBLT_CXX_STD=c++17 .. && \
93+
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP=On -DBLT_CXX_STD=c++20 .. && \
9494
make -j 16 &&\
9595
make clean"
9696

9797
FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2_sycl
9898
ENV GTEST_COLOR=1
9999
COPY . /home/raja/workspace
100100
WORKDIR /home/raja/workspace/build
101-
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && export LD_LIBRARY_PATH=/opt/intel/oneapi/2024.2/lib:\$LD_LIBRARY_PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_CXX_FLAGS=\"-fsycl -fsycl-unnamed-lambda\" -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_OPENMP=Off -DRAJA_ENABLE_SYCL=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++17 .. && \
101+
RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 && export PATH=/opt/intel/oneapi/compiler/2024.2/bin/:\$PATH && export LD_LIBRARY_PATH=/opt/intel/oneapi/2024.2/lib:\$LD_LIBRARY_PATH && cmake -DCMAKE_CXX_COMPILER=icpx -DCMAKE_CXX_FLAGS=\"-fsycl -fsycl-unnamed-lambda\" -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_OPENMP=Off -DRAJA_ENABLE_SYCL=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DBLT_CXX_STD=c++20 .. && \
102102
make -j 16 &&\
103103
make clean"
104104

@@ -107,6 +107,6 @@ ENV GTEST_COLOR=1
107107
ENV HCC_AMDGPU_TARGET=gfx900
108108
COPY . /home/raja/workspace
109109
WORKDIR /home/raja/workspace/build
110-
RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.4.3/bin/amdclang++ -DROCM_PATH=/opt/rocm-6.4.3 -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off -DBLT_CXX_STD=c++17 .. && \
110+
RUN cmake -DCMAKE_CXX_COMPILER=/opt/rocm-6.4.3/bin/amdclang++ -DROCM_PATH=/opt/rocm-6.4.3 -DCMAKE_BUILD_TYPE=Release -DENABLE_HIP=On -DRAJA_ENABLE_DESUL_ATOMICS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off -DBLT_CXX_STD=c++20 .. && \
111111
make -j 16 &&\
112-
make clean
112+
make clean

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ and programming model portability for HPC applications. RAJA has two main goals:
2626

2727
RAJA offers portable, parallel loop execution by providing building blocks
2828
that extend the generally-accepted parallel for idiom. RAJA relies on standard
29-
C++17 features.
29+
C++20 features.
3030

3131
RAJA's design is rooted in decades of experience working on
3232
production mesh-based multiphysics applications. Based on the diversity of
@@ -57,7 +57,7 @@ To clone the repo, use the command:
5757
git clone --recursive https://github.com/llnl/raja.git
5858

5959
Then, you can build RAJA like any other CMake project, provided you have a C++
60-
compiler that supports the C++17 standard. The simplest way to build the code,
60+
compiler that supports the C++20 standard. The simplest way to build the code,
6161
using your system default compiler, is to run the following sequence of
6262
commands in the top-level RAJA directory (in-source builds are not allowed!):
6363

0 commit comments

Comments
 (0)