Skip to content

Commit 9b5f61e

Browse files
rhornung67rhornung67
authored
Merge pull request #1530 from LLNL/v2023.06.1-RC
V2023.06.1 rc
2 parents e330b25 + e7ee7f8 commit 9b5f61e

40 files changed

+505
-229
lines changed

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ stages:
5959
include:
6060
- local: '.gitlab/custom-jobs-and-variables.yml'
6161
- project: 'radiuss/radiuss-shared-ci'
62-
ref: v2023.03.1
62+
ref: v2023.06.0
6363
file: '${CI_MACHINE}-build-and-test.yml'
6464
- local: '.gitlab/${CI_MACHINE}-build-and-test-extra.yml'
6565
strategy: depend

‎.gitlab/corona-build-and-test-extra.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
2222
# describe the spec here.
2323

24-
rocmcc_5_4_1_hip_desul_atomics:
24+
rocmcc_5_5_0_hip_desul_atomics:
2525
variables:
26-
SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@5.4.1 ^hip@5.4.1 ^blt@develop"
26+
SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@5.5.0 ^hip@5.5.0 ^blt@develop"
2727
extends: .build_and_test_on_corona
2828

‎.gitlab/lassen-build-and-test-extra.yml

+5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ xl_2022_08_19_gcc_8_3_1_cuda_11_7_0:
3636
# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
3737
# describe the spec here.
3838

39+
gcc_8_3_1_omptask:
40+
variables:
41+
SPEC: " ~shared +openmp +omptask +tests %gcc@8.3.1"
42+
extends: .build_and_test_on_lassen
43+
3944
gcc_8_3_1_cuda_11_5_0_ats_disabled:
4045
extends: .build_and_test_on_lassen
4146
variables:

‎.gitlab/ruby-build-and-test-extra.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,22 @@
1212
# We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS} So that
1313
# the comparison with the original job is easier.
1414

15-
# No overridden jobs so far.
15+
clang_14_0_6:
16+
variables:
17+
SPEC: " ~shared +openmp +omptask +tests %clang@14.0.6"
18+
extends: .build_and_test_on_ruby
19+
20+
gcc_10_3_1:
21+
variables:
22+
SPEC: " ~shared +openmp +omptask +tests %gcc@10.3.1"
23+
RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=60 --nodes=1"
24+
extends: .build_and_test_on_ruby
25+
26+
intel_19_1_2_gcc_8_5_0:
27+
variables:
28+
SPEC: " ~shared +openmp +omptask +tests %intel@19.1.2.gcc.8.5.0"
29+
RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=90 --nodes=1"
30+
extends: .build_and_test_on_ruby
1631

1732
############
1833
# Extra jobs

‎.gitlab/tioga-build-and-test-extra.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ rocmcc_5_4_3_hip_desul_atomics:
2828

2929
rocmcc_5_4_3_hip_openmp:
3030
variables:
31-
SPEC: "~shared +rocm +openmp +tests amdgpu_target=gfx90a %rocmcc@5.4.3 ^hip@5.4.3 ^blt@develop"
31+
SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@5.4.3 ^hip@5.4.3 ^blt@develop"
3232
extends: .build_and_test_on_tioga

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ endif()
1414
include(CMakeDependentOption)
1515

1616
# Set version number
17-
set(RAJA_VERSION_MAJOR 2022)
18-
set(RAJA_VERSION_MINOR 10)
19-
set(RAJA_VERSION_PATCHLEVEL 5)
17+
set(RAJA_VERSION_MAJOR 2023)
18+
set(RAJA_VERSION_MINOR 06)
19+
set(RAJA_VERSION_PATCHLEVEL 1)
2020

2121
if (RAJA_LOADED AND (NOT RAJA_LOADED STREQUAL "${RAJA_VERSION_MAJOR}.${RAJA_VERSION_MINOR}.${RAJA_VERSION_PATCHLEVEL}"))
2222
message(FATAL_ERROR "You are mixing RAJA versions. Loaded is ${RAJA_LOADED}, expected ${RAJA_VERSION_MAJOR}.${RAJA_VERSION_MINOR}.${RAJA_VERSION_PATCHLEVEL}")

‎Dockerfile

+49-37
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,35 @@ COPY . /home/raja/workspace
1111
WORKDIR /home/raja/workspace/build
1212
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On -DRAJA_DEPRECATED_TESTS=On -DENABLE_OPENMP=On .. && \
1313
make -j 6 &&\
14-
ctest -T test --output-on-failure
14+
ctest -T test --output-on-failure && \
15+
cd .. && rm -rf build
1516

1617
FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-8.1.0 AS gcc8.1.0
1718
ENV GTEST_COLOR=1
1819
COPY . /home/raja/workspace
1920
WORKDIR /home/raja/workspace/build
2021
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_COVERAGE=On -DRAJA_ENABLE_TBB=On -DENABLE_OPENMP=On .. && \
2122
make -j 6 &&\
22-
ctest -T test --output-on-failure
23+
ctest -T test --output-on-failure && \
24+
cd .. && rm -rf build
2325

2426
FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-9.4.0 AS gcc9.4.0
2527
ENV GTEST_COLOR=1
2628
COPY . /home/raja/workspace
2729
WORKDIR /home/raja/workspace/build
2830
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On -DRAJA_ENABLE_RUNTIME_PLUGINS=On -DENABLE_OPENMP=On .. && \
2931
make -j 6 &&\
30-
ctest -T test --output-on-failure
32+
ctest -T test --output-on-failure && \
33+
cd .. && rm -rf build
3134

3235
FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-11.2.0 AS gcc11.2.0
3336
ENV GTEST_COLOR=1
3437
COPY . /home/raja/workspace
3538
WORKDIR /home/raja/workspace/build
3639
RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_TBB=On -DRAJA_ENABLE_BOUNDS_CHECK=ON -DENABLE_OPENMP=On .. && \
3740
make -j 6 &&\
38-
ctest -T test --output-on-failure
41+
ctest -T test --output-on-failure && \
42+
cd .. && rm -rf build
3943

4044
FROM ghcr.io/rse-ops/clang-ubuntu-20.04:llvm-11.0.0 AS clang11.0.0
4145
ENV GTEST_COLOR=1
@@ -44,7 +48,8 @@ WORKDIR /home/raja/workspace/build
4448
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
4549
cmake -DCMAKE_CXX_COMPILER=clang++ -DRAJA_ENABLE_TBB=On -DENABLE_OPENMP=On .. && \
4650
make -j 6 &&\
47-
ctest -T test --output-on-failure
51+
ctest -T test --output-on-failure && \
52+
cd .. && rm -rf build
4853

4954
FROM ghcr.io/rse-ops/clang-ubuntu-20.04:llvm-11.0.0 AS clang11.0.0-debug
5055
ENV GTEST_COLOR=1
@@ -53,7 +58,8 @@ WORKDIR /home/raja/workspace/build
5358
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
5459
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Debug .. && \
5560
make -j 6 &&\
56-
ctest -T test --output-on-failure
61+
ctest -T test --output-on-failure && \
62+
cd .. && rm -rf build
5763

5864
FROM ghcr.io/rse-ops/clang-ubuntu-22.04:llvm-13.0.0 AS clang13.0.0
5965
ENV GTEST_COLOR=1
@@ -62,40 +68,45 @@ WORKDIR /home/raja/workspace/build
6268
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
6369
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Release .. && \
6470
make -j 6 &&\
65-
ctest -T test --output-on-failure
71+
ctest -T test --output-on-failure && \
72+
cd .. && rm -rf build
6673

67-
FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
68-
ENV GTEST_COLOR=1
69-
COPY . /home/raja/workspace
70-
WORKDIR /home/raja/workspace/build
71-
RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
72-
cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
73-
make -j 4
74+
##FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
75+
##ENV GTEST_COLOR=1
76+
##COPY . /home/raja/workspace
77+
##WORKDIR /home/raja/workspace/build
78+
##RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
79+
## cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
80+
## make -j 4 && \
81+
## cd .. && rm -rf build
7482

75-
FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 AS nvcc11.1.1
76-
ENV GTEST_COLOR=1
77-
COPY . /home/raja/workspace
78-
WORKDIR /home/raja/workspace/build
79-
RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
80-
cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
81-
make -j 4
83+
##FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 AS nvcc11.1.1
84+
##ENV GTEST_COLOR=1
85+
##COPY . /home/raja/workspace
86+
##WORKDIR /home/raja/workspace/build
87+
##RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
88+
## cmake -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
89+
## make -j 4 && \
90+
## cd .. && rm -rf build
8291

83-
FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 AS nvcc11.1.-debug
84-
ENV GTEST_COLOR=1
85-
COPY . /home/raja/workspace
86-
WORKDIR /home/raja/workspace/build
87-
RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
88-
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
89-
make -j 4
92+
##FROM ghcr.io/rse-ops/cuda-ubuntu-20.04:cuda-11.1.1 AS nvcc11.1.-debug
93+
##ENV GTEST_COLOR=1
94+
##COPY . /home/raja/workspace
95+
##WORKDIR /home/raja/workspace/build
96+
##RUN . /opt/spack/share/spack/setup-env.sh && spack load cuda && \
97+
## cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_STANDARD=14 -DCMAKE_CUDA_ARCHITECTURES=70 -DENABLE_OPENMP=On .. && \
98+
## make -j 4 && \
99+
## cd .. && rm -rf build
90100

91-
FROM ghcr.io/rse-ops/hip-ubuntu-20.04:hip-5.1.3 AS hip5.1.3
92-
ENV GTEST_COLOR=1
93-
ENV HCC_AMDGPU_TARGET=gfx900
94-
COPY . /home/raja/workspace
95-
WORKDIR /home/raja/workspace/build
96-
RUN . /opt/spack/share/spack/setup-env.sh && spack load hip llvm-amdgpu && \
97-
cmake -DCMAKE_CXX_COMPILER=clang++ -DHIP_PATH=/opt -DENABLE_HIP=On -DENABLE_CUDA=Off -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \
98-
make -j 6
101+
##FROM ghcr.io/rse-ops/hip-ubuntu-20.04:hip-5.1.3 AS hip5.1.3
102+
##ENV GTEST_COLOR=1
103+
##ENV HCC_AMDGPU_TARGET=gfx900
104+
##COPY . /home/raja/workspace
105+
##WORKDIR /home/raja/workspace/build
106+
##RUN . /opt/spack/share/spack/setup-env.sh && spack load hip llvm-amdgpu && \
107+
## cmake -DCMAKE_CXX_COMPILER=clang++ -DHIP_PATH=/opt -DENABLE_HIP=On -DENABLE_CUDA=Off -DRAJA_ENABLE_WARNINGS_AS_ERRORS=Off .. && \
108+
## make -j 6 && \
109+
## cd .. && rm -rf build
99110

100111
FROM ghcr.io/rse-ops/intel-ubuntu-22.04:intel-2022.1.0 AS sycl
101112
ENV GTEST_COLOR=1
@@ -104,4 +115,5 @@ WORKDIR /home/raja/workspace/build
104115
RUN /bin/bash -c "source /opt/view/setvars.sh && \
105116
cmake -DCMAKE_CXX_COMPILER=dpcpp -DRAJA_ENABLE_SYCL=On -DENABLE_OPENMP=Off -DENABLE_ALL_WARNINGS=Off -DBLT_CXX_STD=c++17 .. && \
106117
make -j 6 &&\
107-
ctest -T test --output-on-failure"
118+
ctest -T test --output-on-failure" && \
119+
cd .. && rm -rf build

‎RELEASE_NOTES.md

+30-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
77
[comment]: # (#################################################################)
88

9-
Version vxx.yy.zz -- Release date 20yy-mm-dd
9+
Version YYYY.MM.PP -- Release date 20yy-mm-dd
1010
============================================
1111

1212
This release contains ...
@@ -20,6 +20,35 @@ Notable changes include:
2020
* Bug fixes/improvements:
2121

2222

23+
Version 2023.06.1 -- Release date 2023-08-16
24+
============================================
25+
26+
This release contains various smaller RAJA improvements.
27+
28+
Notable changes include:
29+
30+
* New features / API changes:
31+
* Add compile time block size optimization for new reduction interface.
32+
* Changed default stream usage for Workgroup constructs to use the
33+
stream associated with the default (camp) resource. Previously, we were
34+
using stream zero. Specifically, this change affects where we memset
35+
memory in the zeroed device memory pool and where we get device function
36+
pointers for WorkGroup.
37+
38+
* Build changes/improvements:
39+
* RAJA_ENABLE_OPENMP_TASK CMake option added to enable/disable algorithm
40+
options based on OpenMP task construct. Currently, this only applies
41+
to RAJA's OpenMP sort implementation. The default is 'Off'. The option
42+
allows users to choose a task implementation if they wish.
43+
* Resolve several compiler warnings.
44+
45+
* Bug fixes/improvements:
46+
* Fix compilation of GPU occupancy calculator and use common types for
47+
HIP and CUDA backends in the occupancy calculator, kernel policies,
48+
and kernel launch helper routines.
49+
* Fix direct cudaMalloc/hipMalloc calls and memory leaks.
50+
51+
2352
Version 2023.06.0 -- Release date 2023-07-06
2453
============================================
2554

‎azure-pipelines.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
docker_target: clang11.0.0-debug
4949
clang13.0.0:
5050
docker_target: clang13.0.0
51-
nvcc10.1.243:
52-
docker_target: nvcc10.1.243
53-
nvcc11.1.1:
54-
docker_target: nvcc11.1.1
51+
## nvcc10.1.243:
52+
## docker_target: nvcc10.1.243
53+
## nvcc11.1.1:
54+
## docker_target: nvcc11.1.1
5555
## nvcc11.1.1-debug:
5656
## docker_target: nvcc11.1.1-debug
57-
hip5.1.3:
58-
docker_target: hip5.1.3
57+
## hip5.1.3:
58+
## docker_target: hip5.1.3
5959
sycl:
6060
docker_target: sycl
6161
pool:

‎cmake/SetupRajaOptions.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ option(RAJA_ENABLE_SYCL "Build SYCL support" Off)
1717

1818
option(RAJA_ENABLE_VECTORIZATION "Build experimental vectorization support" On)
1919

20+
option(RAJA_ENABLE_OPENMP_TASK "Build OpenMP task variants of certain algorithms" Off)
21+
2022
option(RAJA_ENABLE_REPRODUCERS "Build issue reproducers" Off)
2123

2224
option(RAJA_ENABLE_EXERCISES "Build exercises " On)

‎docs/sphinx/user_guide/feature/policies.rst

+30-5
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,37 @@ policies have the prefix ``hip_``.
279279
CUDA/HIP Execution Policies Works with Brief description
280280
========================================= ============= =======================================
281281
cuda/hip_exec<BLOCK_SIZE> forall, Execute loop iterations
282-
scan, in a GPU kernel launched
283-
sort with given thread-block
284-
size. Note that the
282+
scan, directly mapped to global threads
283+
sort in a GPU kernel launched
284+
with given thread-block
285+
size and unbounded grid size.
286+
Note that the thread-block
287+
size must be provided,
288+
there is no default.
289+
cuda/hip_exec_grid<BLOCK_SIZE, GRID_SIZE> forall, Execute loop iterations
290+
mapped to global threads via
291+
grid striding with multiple
292+
iterations per global thread
293+
in a GPU kernel launched
294+
with given thread-block
295+
size and grid size.
296+
Note that the thread-block
297+
size and grid size must be
298+
provided, there is no default.
299+
cuda/hip_exec_occ_calc<BLOCK_SIZE> forall Execute loop iterations
300+
mapped to global threads via
301+
grid striding with multiple
302+
iterations per global thread
303+
in a GPU kernel launched
304+
with given thread-block
305+
size and grid size bounded
306+
by the maximum occupancy of
307+
the kernel. Note that the
285308
thread-block size must
286-
be provided, there is
287-
no default.
309+
be provided, there is no
310+
default. Note this can improve
311+
reducer performance in kernels
312+
with large iteration counts.
288313
cuda/hip_launch_t launch Launches a device kernel,
289314
any code expressed within
290315
the lambda is executed

‎host-configs/lc-builds/toss3/icpc_X_gcc8headers.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
set(RAJA_COMPILER "RAJA_COMPILER_ICC" CACHE STRING "")
99

10-
set(COMMON_FLAGS "-gxx-name=/usr/tce/packages/gcc/gcc-8.1.0/bin/g++")
10+
set(COMMON_FLAGS "-gxx-name=/usr/tce/packages/gcc/gcc-8.3.1/bin/g++")
1111

1212
set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_FLAGS} -O3 -march=native -ansi-alias -diag-disable cpu-dispatch" CACHE STRING "")
1313
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -O3 -g -march=native -ansi-alias -diag-disable cpu-dispatch" CACHE STRING "")

‎host-configs/lc-builds/toss4/icpc-classic_X.cmake

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
###############################################################################
2+
# Copyright (c) 2016-23, Lawrence Livermore National Security, LLC
3+
# and RAJA project contributors. See the RAJA/LICENSE file for details.
4+
#
5+
# SPDX-License-Identifier: (BSD-3-Clause)
6+
###############################################################################
7+
8+
set(RAJA_COMPILER "RAJA_COMPILER_ICC" CACHE STRING "")
9+
10+
set(COMMON_FLAGS "-gxx-name=/usr/tce/packages/gcc/gcc-10.3.1/bin/g++")
11+
12+
set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_FLAGS} -O3 -march=native -ansi-alias -diag-disable cpu-dispatch" CACHE STRING "")
13+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -O3 -g -march=native -ansi-alias -diag-disable cpu-dispatch" CACHE STRING "")
14+
set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_FLAGS} -O0 -g" CACHE STRING "")
15+
16+
set(RAJA_DATA_ALIGN 64 CACHE STRING "")
17+
18+
set(RAJA_HOST_CONFIG_LOADED On CACHE BOOL "")

‎include/RAJA/config.hpp.in

+7-3
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ static_assert(RAJA_HAS_SOME_CXX14,
176176
#cmakedefine RAJA_ENABLE_CLANG_CUDA
177177
#cmakedefine RAJA_ENABLE_HIP
178178
#cmakedefine RAJA_ENABLE_SYCL
179+
180+
#cmakedefine RAJA_ENABLE_OMP_TASK
179181
#cmakedefine RAJA_ENABLE_VECTORIZATION
180182

181183
#cmakedefine RAJA_ENABLE_NV_TOOLS_EXT
@@ -254,12 +256,14 @@ namespace RAJA {
254256
#if defined(RAJA_ENABLE_OPENMP) && !defined(__HIP_DEVICE_COMPILE__)
255257
#if defined(_OPENMP)
256258
#if (_OPENMP >= 200805)
257-
#define RAJA_ENABLE_OPENMP_TASK
259+
#if defined(RAJA_ENABLE_OPENMP_TASK)
260+
#define RAJA_ENABLE_OPENMP_TASK_INTERNAL
258261
#endif
262+
#endif // _OPENMP >= 200805
259263
#else
260264
#error RAJA configured with RAJA_ENABLE_OPENMP, but _OPENMP is not defined in this code section
261-
#endif // _OPENMP
262-
#endif // RAJA_ENABLE_OPENMP && __HIP_DEVICE_COMPILE__
265+
#endif // else
266+
#endif // RAJA_ENABLE_OPENMP && !__HIP_DEVICE_COMPILE__
263267

264268
#if defined(RAJA_ENABLE_CUDA) && defined(__CUDACC__)
265269
#define RAJA_CUDA_ACTIVE

0 commit comments

Comments
 (0)