Skip to content

Commit 2dd38ad

Browse files
committed
Refactor configuration.
OPDI_BACKEND_GENERATE_MASTER_EVENTS -> OPDI_BACKEND_GENERATE_MASKED_EVENTS
1 parent 66f1a62 commit 2dd38ad

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ clang-macro:
1818
image: fedora:41
1919
parallel:
2020
matrix:
21-
- FLAGS: ["", "-DOPDI_BACKEND_GENERATE_MASTER_EVENTS=1 -DOPDI_BACKEND_GENERATE_WORK_EVENTS=1"]
21+
- FLAGS: ["", "-DOPDI_BACKEND_GENERATE_MASKED_EVENTS=1 -DOPDI_BACKEND_GENERATE_WORK_EVENTS=1"]
2222
script:
2323
- dnf install -y diffutils binutils clang git
2424
- git clone --depth 1 --branch develop https://github.com/SciCompKL/CoDiPack.git
@@ -32,7 +32,7 @@ clang-ompt:
3232
image: fedora:41
3333
parallel:
3434
matrix:
35-
- FLAGS: ["-DOPDI_OMPT_BACKEND_IMPLICIT_TASK_END_SOURCE=1", "-DOPDI_OMPT_BACKEND_IMPLICIT_TASK_END_SOURCE=2", "-DOPDI_BACKEND_GENERATE_MASTER_EVENTS=1 -DOPDI_BACKEND_GENERATE_WORK_EVENTS=1"]
35+
- FLAGS: ["-DOPDI_OMPT_BACKEND_IMPLICIT_TASK_END_SOURCE=1", "-DOPDI_OMPT_BACKEND_IMPLICIT_TASK_END_SOURCE=2", "-DOPDI_BACKEND_GENERATE_MASKED_EVENTS=1 -DOPDI_BACKEND_GENERATE_WORK_EVENTS=1"]
3636
script:
3737
- dnf install -y diffutils binutils clang git
3838
- git clone --depth 1 --branch develop https://github.com/SciCompKL/CoDiPack.git

include/opdi/backend/macro/macros.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145

146146
#define OPDI_END_SECTION
147147

148-
#if OPDI_BACKEND_GENERATE_MASTER_EVENTS
148+
#if OPDI_BACKEND_GENERATE_MASKED_EVENTS
149149
#define OPDI_MASTER(...) \
150150
OPDI_PRAGMA(omp master __VA_ARGS__) \
151151
{ \

include/opdi/backend/ompt/omptBackend.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ namespace opdi {
107107
SyncRegionCallbacks::init();
108108
MutexCallbacks::init();
109109
ReductionCallbacks::init();
110-
#if OPDI_BACKEND_GENERATE_MASTER_EVENTS
110+
#if OPDI_BACKEND_GENERATE_MASKED_EVENTS
111111
MasterCallbacks::init();
112112
#endif
113113

@@ -119,7 +119,7 @@ namespace opdi {
119119
OPDI_UNUSED(toolData);
120120

121121
// finalize callback structures
122-
#if OPDI_BACKEND_GENERATE_MASTER_EVENTS
122+
#if OPDI_BACKEND_GENERATE_MASKED_EVENTS
123123
MasterCallbacks::finalize();
124124
#endif
125125
ReductionCallbacks::finalize();

include/opdi/config.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747

4848
/* ----- backend configuration ----- */
4949

50-
#ifndef OPDI_BACKEND_GENERATE_MASTER_EVENTS
51-
#define OPDI_BACKEND_GENERATE_MASTER_EVENTS 0
50+
#ifndef OPDI_BACKEND_GENERATE_MASKED_EVENTS
51+
#define OPDI_BACKEND_GENERATE_MASKED_EVENTS 0
5252
#endif
5353

5454
#ifndef OPDI_BACKEND_GENERATE_WORK_EVENTS

0 commit comments

Comments
 (0)