Skip to content

Commit 037b40b

Browse files
hjelmnhjelmn
authored
Merge pull request #8591 from hjelmn/for_the_love_of_all_things_DO_NOT_NAME_VARIABLES_ASSERT
ompi: rename assert variables to mpi_assert
2 parents 2edb461 + aaabe3d commit 037b40b

23 files changed

+119
-113
lines changed

‎ompi/include/mpi.h.in‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* and Technology (RIST). All rights reserved.
2222
* Copyright (c) 2017-2019 IBM Corporation. All rights reserved.
2323
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
24+
* Copyright (c) 2021 Google, LLC. All rights reserved.
2425
* $COPYRIGHT$
2526
*
2627
* Additional copyrights may follow
@@ -1918,7 +1919,7 @@ OMPI_DECLSPEC int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_at
19181919
OMPI_DECLSPEC int MPI_Win_delete_attr(MPI_Win win, int win_keyval);
19191920
OMPI_DECLSPEC int MPI_Win_detach(MPI_Win win, const void *base);
19201921
OMPI_DECLSPEC MPI_Win MPI_Win_f2c(MPI_Fint win);
1921-
OMPI_DECLSPEC int MPI_Win_fence(int assert, MPI_Win win);
1922+
OMPI_DECLSPEC int MPI_Win_fence(int mpi_assert, MPI_Win win);
19221923
OMPI_DECLSPEC int MPI_Win_flush(int rank, MPI_Win win);
19231924
OMPI_DECLSPEC int MPI_Win_flush_all(MPI_Win win);
19241925
OMPI_DECLSPEC int MPI_Win_flush_local(int rank, MPI_Win win);
@@ -1931,15 +1932,15 @@ OMPI_DECLSPEC int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandle
19311932
OMPI_DECLSPEC int MPI_Win_get_group(MPI_Win win, MPI_Group *group);
19321933
OMPI_DECLSPEC int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used);
19331934
OMPI_DECLSPEC int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen);
1934-
OMPI_DECLSPEC int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win);
1935-
OMPI_DECLSPEC int MPI_Win_lock_all(int assert, MPI_Win win);
1936-
OMPI_DECLSPEC int MPI_Win_post(MPI_Group group, int assert, MPI_Win win);
1935+
OMPI_DECLSPEC int MPI_Win_lock(int lock_type, int rank, int mpi_assert, MPI_Win win);
1936+
OMPI_DECLSPEC int MPI_Win_lock_all(int mpi_assert, MPI_Win win);
1937+
OMPI_DECLSPEC int MPI_Win_post(MPI_Group group, int mpi_assert, MPI_Win win);
19371938
OMPI_DECLSPEC int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val);
19381939
OMPI_DECLSPEC int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler);
19391940
OMPI_DECLSPEC int MPI_Win_set_info(MPI_Win win, MPI_Info info);
19401941
OMPI_DECLSPEC int MPI_Win_set_name(MPI_Win win, const char *win_name);
19411942
OMPI_DECLSPEC int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr);
1942-
OMPI_DECLSPEC int MPI_Win_start(MPI_Group group, int assert, MPI_Win win);
1943+
OMPI_DECLSPEC int MPI_Win_start(MPI_Group group, int mpi_assert, MPI_Win win);
19431944
OMPI_DECLSPEC int MPI_Win_sync(MPI_Win win);
19441945
OMPI_DECLSPEC int MPI_Win_test(MPI_Win win, int *flag);
19451946
OMPI_DECLSPEC int MPI_Win_unlock(int rank, MPI_Win win);
@@ -2583,7 +2584,7 @@ OMPI_DECLSPEC int PMPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_a
25832584
OMPI_DECLSPEC int PMPI_Win_delete_attr(MPI_Win win, int win_keyval);
25842585
OMPI_DECLSPEC int PMPI_Win_detach(MPI_Win win, const void *base);
25852586
OMPI_DECLSPEC MPI_Win PMPI_Win_f2c(MPI_Fint win);
2586-
OMPI_DECLSPEC int PMPI_Win_fence(int assert, MPI_Win win);
2587+
OMPI_DECLSPEC int PMPI_Win_fence(int mpi_assert, MPI_Win win);
25872588
OMPI_DECLSPEC int PMPI_Win_flush(int rank, MPI_Win win);
25882589
OMPI_DECLSPEC int PMPI_Win_flush_all(MPI_Win win);
25892590
OMPI_DECLSPEC int PMPI_Win_flush_local(int rank, MPI_Win win);
@@ -2596,15 +2597,15 @@ OMPI_DECLSPEC int PMPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandl
25962597
OMPI_DECLSPEC int PMPI_Win_get_group(MPI_Win win, MPI_Group *group);
25972598
OMPI_DECLSPEC int PMPI_Win_get_info(MPI_Win win, MPI_Info *info_used);
25982599
OMPI_DECLSPEC int PMPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen);
2599-
OMPI_DECLSPEC int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win);
2600-
OMPI_DECLSPEC int PMPI_Win_lock_all(int assert, MPI_Win win);
2601-
OMPI_DECLSPEC int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win);
2600+
OMPI_DECLSPEC int PMPI_Win_lock(int lock_type, int rank, int mpi_assert, MPI_Win win);
2601+
OMPI_DECLSPEC int PMPI_Win_lock_all(int mpi_assert, MPI_Win win);
2602+
OMPI_DECLSPEC int PMPI_Win_post(MPI_Group group, int mpi_assert, MPI_Win win);
26022603
OMPI_DECLSPEC int PMPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val);
26032604
OMPI_DECLSPEC int PMPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler);
26042605
OMPI_DECLSPEC int PMPI_Win_set_info(MPI_Win win, MPI_Info info);
26052606
OMPI_DECLSPEC int PMPI_Win_set_name(MPI_Win win, const char *win_name);
26062607
OMPI_DECLSPEC int PMPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr);
2607-
OMPI_DECLSPEC int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win);
2608+
OMPI_DECLSPEC int PMPI_Win_start(MPI_Group group, int mpi_assert, MPI_Win win);
26082609
OMPI_DECLSPEC int PMPI_Win_sync(MPI_Win win);
26092610
OMPI_DECLSPEC int PMPI_Win_test(MPI_Win win, int *flag);
26102611
OMPI_DECLSPEC int PMPI_Win_unlock(int rank, MPI_Win win);

‎ompi/mca/osc/monitoring/osc_monitoring_active_target.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
#define OSC_MONITORING_GENERATE_TEMPLATE_ACTIVE_TARGET(template) \
1919
\
20-
static int ompi_osc_monitoring_## template ##_post (ompi_group_t *group, int assert, ompi_win_t *win) \
20+
static int ompi_osc_monitoring_## template ##_post (ompi_group_t *group, int mpi_assert, ompi_win_t *win) \
2121
{ \
22-
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_post(group, assert, win); \
22+
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_post(group, mpi_assert, win); \
2323
} \
2424
\
25-
static int ompi_osc_monitoring_## template ##_start (ompi_group_t *group, int assert, ompi_win_t *win) \
25+
static int ompi_osc_monitoring_## template ##_start (ompi_group_t *group, int mpi_assert, ompi_win_t *win) \
2626
{ \
27-
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_start(group, assert, win); \
27+
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_start(group, mpi_assert, win); \
2828
} \
2929
\
3030
static int ompi_osc_monitoring_## template ##_complete (ompi_win_t *win) \
@@ -42,9 +42,9 @@
4242
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_test(win, flag); \
4343
} \
4444
\
45-
static int ompi_osc_monitoring_## template ##_fence (int assert, ompi_win_t *win) \
45+
static int ompi_osc_monitoring_## template ##_fence (int mpi_assert, ompi_win_t *win) \
4646
{ \
47-
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_fence(assert, win); \
47+
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_fence(mpi_assert, win); \
4848
}
4949

5050
#endif /* MCA_OSC_MONITORING_ACTIVE_TARGET_H */

‎ompi/mca/osc/monitoring/osc_monitoring_passive_target.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@
4141
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_flush_local_all(win); \
4242
} \
4343
\
44-
static int ompi_osc_monitoring_## template ##_lock (int lock_type, int target, int assert, ompi_win_t *win) \
44+
static int ompi_osc_monitoring_## template ##_lock (int lock_type, int target, int mpi_assert, ompi_win_t *win) \
4545
{ \
46-
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_lock(lock_type, target, assert, win); \
46+
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_lock(lock_type, target, mpi_assert, win); \
4747
} \
4848
\
4949
static int ompi_osc_monitoring_## template ##_unlock (int target, ompi_win_t *win) \
5050
{ \
5151
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_unlock(target, win); \
5252
} \
5353
\
54-
static int ompi_osc_monitoring_## template ##_lock_all (int assert, struct ompi_win_t *win) \
54+
static int ompi_osc_monitoring_## template ##_lock_all (int mpi_assert, struct ompi_win_t *win) \
5555
{ \
56-
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_lock_all(assert, win); \
56+
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_lock_all(mpi_assert, win); \
5757
} \
5858
\
5959
static int ompi_osc_monitoring_## template ##_unlock_all (struct ompi_win_t *win) \

‎ompi/mca/osc/osc.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,19 @@ typedef int (*ompi_osc_base_module_rget_accumulate_fn_t)(const void *origin_addr
309309
struct ompi_win_t *win,
310310
struct ompi_request_t **request);
311311

312-
typedef int (*ompi_osc_base_module_fence_fn_t)(int assert, struct ompi_win_t *win);
312+
typedef int (*ompi_osc_base_module_fence_fn_t)(int mpi_assert, struct ompi_win_t *win);
313313

314314

315315
typedef int (*ompi_osc_base_module_start_fn_t)(struct ompi_group_t *group,
316-
int assert,
316+
int mpi_assert,
317317
struct ompi_win_t *win);
318318

319319

320320
typedef int (*ompi_osc_base_module_complete_fn_t)(struct ompi_win_t *win);
321321

322322

323323
typedef int (*ompi_osc_base_module_post_fn_t)(struct ompi_group_t *group,
324-
int assert,
324+
int mpi_assert,
325325
struct ompi_win_t *win);
326326

327327

@@ -334,13 +334,13 @@ typedef int (*ompi_osc_base_module_test_fn_t)(struct ompi_win_t *win,
334334

335335
typedef int (*ompi_osc_base_module_lock_fn_t)(int lock_type,
336336
int target,
337-
int assert,
337+
int mpi_assert,
338338
struct ompi_win_t *win);
339339

340340
typedef int (*ompi_osc_base_module_unlock_fn_t)(int target,
341341
struct ompi_win_t *win);
342342

343-
typedef int (*ompi_osc_base_module_lock_all_fn_t)(int assert,
343+
typedef int (*ompi_osc_base_module_lock_all_fn_t)(int mpi_assert,
344344
struct ompi_win_t *win);
345345

346346
typedef int (*ompi_osc_base_module_unlock_all_fn_t)(struct ompi_win_t *win);

‎ompi/mca/osc/portals4/osc_portals4.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,16 @@ int ompi_osc_portals4_rget_accumulate(const void *origin_addr,
242242
struct ompi_win_t *win,
243243
struct ompi_request_t **request);
244244

245-
int ompi_osc_portals4_fence(int assert, struct ompi_win_t *win);
245+
int ompi_osc_portals4_fence(int mpi_assert, struct ompi_win_t *win);
246246

247247
int ompi_osc_portals4_start(struct ompi_group_t *group,
248-
int assert,
248+
int mpi_assert,
249249
struct ompi_win_t *win);
250250

251251
int ompi_osc_portals4_complete(struct ompi_win_t *win);
252252

253253
int ompi_osc_portals4_post(struct ompi_group_t *group,
254-
int assert,
254+
int mpi_assert,
255255
struct ompi_win_t *win);
256256

257257
int ompi_osc_portals4_wait(struct ompi_win_t *win);
@@ -261,14 +261,14 @@ int ompi_osc_portals4_test(struct ompi_win_t *win,
261261

262262
int ompi_osc_portals4_lock(int lock_type,
263263
int target,
264-
int assert,
264+
int mpi_assert,
265265
struct ompi_win_t *win);
266266

267267
int ompi_osc_portals4_unlock(int target,
268268
struct ompi_win_t *win);
269269

270270

271-
int ompi_osc_portals4_lock_all(int assert,
271+
int ompi_osc_portals4_lock_all(int mpi_assert,
272272
struct ompi_win_t *win);
273273

274274
int ompi_osc_portals4_unlock_all(struct ompi_win_t *win);

‎ompi/mca/osc/portals4/osc_portals4_active_target.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
int
23-
ompi_osc_portals4_fence(int assert, struct ompi_win_t *win)
23+
ompi_osc_portals4_fence(int mpi_assert, struct ompi_win_t *win)
2424
{
2525
ompi_osc_portals4_module_t *module =
2626
(ompi_osc_portals4_module_t*) win->w_osc_module;
@@ -42,7 +42,7 @@ ompi_osc_portals4_fence(int assert, struct ompi_win_t *win)
4242

4343
int
4444
ompi_osc_portals4_start(struct ompi_group_t *group,
45-
int assert,
45+
int mpi_assert,
4646
struct ompi_win_t *win)
4747
{
4848
ompi_osc_portals4_module_t *module =
@@ -53,7 +53,7 @@ ompi_osc_portals4_start(struct ompi_group_t *group,
5353
return OMPI_ERR_RMA_SYNC;
5454
}
5555

56-
if (0 == (assert & MPI_MODE_NOCHECK)) {
56+
if (0 == (mpi_assert & MPI_MODE_NOCHECK)) {
5757
int size;
5858

5959
OBJ_RETAIN(group);
@@ -115,14 +115,14 @@ ompi_osc_portals4_complete(struct ompi_win_t *win)
115115

116116
int
117117
ompi_osc_portals4_post(struct ompi_group_t *group,
118-
int assert,
118+
int mpi_assert,
119119
struct ompi_win_t *win)
120120
{
121121
ompi_osc_portals4_module_t *module =
122122
(ompi_osc_portals4_module_t*) win->w_osc_module;
123123
int ret, i, size;
124124

125-
if (0 == (assert & MPI_MODE_NOCHECK)) {
125+
if (0 == (mpi_assert & MPI_MODE_NOCHECK)) {
126126
OBJ_RETAIN(group);
127127
module->post_group = group;
128128

‎ompi/mca/osc/portals4/osc_portals4_passive_target.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ end_shared(ompi_osc_portals4_module_t *module,
198198
int
199199
ompi_osc_portals4_lock(int lock_type,
200200
int target,
201-
int assert,
201+
int mpi_assert,
202202
struct ompi_win_t *win)
203203
{
204204
ompi_osc_portals4_module_t *module =
@@ -211,7 +211,7 @@ ompi_osc_portals4_lock(int lock_type,
211211
lock = OBJ_NEW(ompi_osc_portals4_outstanding_lock_t);
212212
lock->target = target;
213213

214-
if (0 == (assert & MPI_MODE_NOCHECK)) {
214+
if (0 == (mpi_assert & MPI_MODE_NOCHECK)) {
215215
if (MPI_LOCK_EXCLUSIVE == lock_type) {
216216
lock->lock_type = lock_exclusive;
217217
ret = start_exclusive(module, target);
@@ -276,7 +276,7 @@ ompi_osc_portals4_unlock(int target,
276276

277277

278278
int
279-
ompi_osc_portals4_lock_all(int assert,
279+
ompi_osc_portals4_lock_all(int mpi_assert,
280280
struct ompi_win_t *win)
281281
{
282282
ompi_osc_portals4_module_t *module =
@@ -289,7 +289,7 @@ ompi_osc_portals4_lock_all(int assert,
289289
lock = OBJ_NEW(ompi_osc_portals4_outstanding_lock_t);
290290
lock->target = -1;
291291

292-
if (0 == (assert & MPI_MODE_NOCHECK)) {
292+
if (0 == (mpi_assert & MPI_MODE_NOCHECK)) {
293293
int i, comm_size;
294294

295295
lock->lock_type = lock_shared;

‎ompi/mca/osc/rdma/osc_rdma_active_target.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* of Tennessee Research Foundation. All rights
1818
* reserved.
1919
* Copyright (c) 2017-2018 Intel, Inc. All rights reserved.
20+
* Copyright (c) 2021 Google, LLC. All rights reserved.
2021
* $COPYRIGHT$
2122
*
2223
* Additional copyrights may follow
@@ -297,14 +298,14 @@ static int ompi_osc_rdma_post_peer (ompi_osc_rdma_module_t *module, ompi_osc_rdm
297298
return OMPI_SUCCESS;
298299
}
299300

300-
int ompi_osc_rdma_post_atomic (ompi_group_t *group, int assert, ompi_win_t *win)
301+
int ompi_osc_rdma_post_atomic (ompi_group_t *group, int mpi_assert, ompi_win_t *win)
301302
{
302303
ompi_osc_rdma_module_t *module = GET_MODULE(win);
303304
ompi_osc_rdma_peer_t **peers;
304305
ompi_osc_rdma_state_t *state = module->state;
305306
int ret = OMPI_SUCCESS;
306307

307-
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "post: %p, %d, %s", (void*) group, assert, win->w_name);
308+
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "post: %p, %d, %s", (void*) group, mpi_assert, win->w_name);
308309

309310
/* check if we are already in a post epoch */
310311
if (module->pw_group) {
@@ -329,7 +330,7 @@ int ompi_osc_rdma_post_atomic (ompi_group_t *group, int assert, ompi_win_t *win)
329330
state->num_complete_msgs = 0;
330331
OPAL_THREAD_UNLOCK(&module->lock);
331332

332-
if ((assert & MPI_MODE_NOCHECK) || 0 == ompi_group_size (group)) {
333+
if ((mpi_assert & MPI_MODE_NOCHECK) || 0 == ompi_group_size (group)) {
333334
return OMPI_SUCCESS;
334335
}
335336

@@ -356,15 +357,15 @@ int ompi_osc_rdma_post_atomic (ompi_group_t *group, int assert, ompi_win_t *win)
356357
return ret;
357358
}
358359

359-
int ompi_osc_rdma_start_atomic (ompi_group_t *group, int assert, ompi_win_t *win)
360+
int ompi_osc_rdma_start_atomic (ompi_group_t *group, int mpi_assert, ompi_win_t *win)
360361
{
361362
ompi_osc_rdma_module_t *module = GET_MODULE(win);
362363
ompi_osc_rdma_pending_post_t *pending_post, *next;
363364
ompi_osc_rdma_state_t *state = module->state;
364365
ompi_osc_rdma_sync_t *sync = &module->all_sync;
365366
int group_size = ompi_group_size (group);
366367

367-
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "start: %p, %d, %s", (void*) group, assert,
368+
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "start: %p, %d, %s", (void*) group, mpi_assert,
368369
win->w_name);
369370

370371
OPAL_THREAD_LOCK(&module->lock);
@@ -408,7 +409,7 @@ int ompi_osc_rdma_start_atomic (ompi_group_t *group, int assert, ompi_win_t *win
408409
/* save the group */
409410
OBJ_RETAIN(group);
410411

411-
if (!(assert & MPI_MODE_NOCHECK)) {
412+
if (!(mpi_assert & MPI_MODE_NOCHECK)) {
412413
/* look through list of pending posts */
413414
OPAL_LIST_FOREACH_SAFE(pending_post, next, &module->pending_posts, ompi_osc_rdma_pending_post_t) {
414415
for (int i = 0 ; i < group_size ; ++i) {
@@ -586,12 +587,12 @@ int ompi_osc_rdma_test_atomic (ompi_win_t *win, int *flag)
586587
return OMPI_SUCCESS;
587588
}
588589

589-
int ompi_osc_rdma_fence_atomic (int assert, ompi_win_t *win)
590+
int ompi_osc_rdma_fence_atomic (int mpi_assert, ompi_win_t *win)
590591
{
591592
ompi_osc_rdma_module_t *module = GET_MODULE(win);
592593
int ret = OMPI_SUCCESS;
593594

594-
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "fence: %d, %s", assert, win->w_name);
595+
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "fence: %d, %s", mpi_assert, win->w_name);
595596

596597
/* can't enter an active target epoch while a lock is active */
597598
if (ompi_osc_rdma_in_passive_epoch (module) || module->pw_group) {
@@ -604,7 +605,7 @@ int ompi_osc_rdma_fence_atomic (int assert, ompi_win_t *win)
604605
OPAL_THREAD_LOCK(&module->lock);
605606

606607
/* active sends are now active (we will close the epoch if NOSUCCEED is specified) */
607-
if (0 == (assert & MPI_MODE_NOSUCCEED)) {
608+
if (0 == (mpi_assert & MPI_MODE_NOSUCCEED)) {
608609
module->all_sync.type = OMPI_OSC_RDMA_SYNC_TYPE_FENCE;
609610
module->all_sync.num_peers = ompi_comm_size (module->comm);
610611
/* NTH: should add a fast access array for peers here later. for now just use the
@@ -625,7 +626,7 @@ int ompi_osc_rdma_fence_atomic (int assert, ompi_win_t *win)
625626
/* ensure all writes to my memory are complete (both local stores, and RMA operations) */
626627
ret = module->comm->c_coll->coll_barrier(module->comm, module->comm->c_coll->coll_barrier_module);
627628

628-
if (assert & MPI_MODE_NOSUCCEED) {
629+
if (mpi_assert & MPI_MODE_NOSUCCEED) {
629630
/* as specified in MPI-3 p 438 3-5 the fence can end an epoch. it isn't explicitly
630631
* stated that MPI_MODE_NOSUCCEED ends the epoch but it is a safe assumption. */
631632
module->all_sync.type = OMPI_OSC_RDMA_SYNC_TYPE_NONE;

0 commit comments

Comments
 (0)