Skip to content

Commit dff9ea5

Browse files
joe-explrjoe-explr
committed
Public APIs for:
Adhering to the naming conventions in the proposal Signed-off-by: Joseph Antony jajoseph.antony18@gmail.com
1 parent 80fef14 commit dff9ea5

File tree

11 files changed

+42
-42
lines changed

11 files changed

+42
-42
lines changed

‎ompi/include/mpi.h.in‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,11 +1918,11 @@ OMPI_DECLSPEC int MPI_Get_c(void *origin_addr, MPI_Count origin_count,
19181918
MPI_Datatype origin_datatype, int target_rank,
19191919
MPI_Aint target_disp, MPI_Count target_count,
19201920
MPI_Datatype target_datatype, MPI_Win win);
1921-
OMPI_DECLSPEC int MPI_Get_with_notify(void *origin_addr, int origin_count,
1921+
OMPI_DECLSPEC int MPI_Get_notify(void *origin_addr, int origin_count,
19221922
MPI_Datatype origin_datatype, int target_rank,
19231923
MPI_Aint target_disp, int target_count,
19241924
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
1925-
OMPI_DECLSPEC int MPI_Get_with_notify_c(void *origin_addr, MPI_Count origin_count,
1925+
OMPI_DECLSPEC int MPI_Get_notify_c(void *origin_addr, MPI_Count origin_count,
19261926
MPI_Datatype origin_datatype, int target_rank,
19271927
MPI_Aint target_disp, MPI_Count target_count,
19281928
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
@@ -2189,10 +2189,10 @@ OMPI_DECLSPEC int MPI_Put(const void *origin_addr, int origin_count, MPI_Dataty
21892189
OMPI_DECLSPEC int MPI_Put_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
21902190
int target_rank, MPI_Aint target_disp, MPI_Count target_count,
21912191
MPI_Datatype target_datatype, MPI_Win win);
2192-
OMPI_DECLSPEC int MPI_Put_with_notify(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
2192+
OMPI_DECLSPEC int MPI_Put_notify(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
21932193
int target_rank, MPI_Aint target_disp, int target_count,
21942194
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
2195-
OMPI_DECLSPEC int MPI_Put_with_notify_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
2195+
OMPI_DECLSPEC int MPI_Put_notify_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
21962196
int target_rank, MPI_Aint target_disp, MPI_Count target_count,
21972197
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
21982198
OMPI_DECLSPEC int MPI_Query_thread(int *provided);
@@ -3108,11 +3108,11 @@ OMPI_DECLSPEC int PMPI_Get_c(void *origin_addr, MPI_Count origin_count,
31083108
MPI_Datatype origin_datatype, int target_rank,
31093109
MPI_Aint target_disp, MPI_Count target_count,
31103110
MPI_Datatype target_datatype, MPI_Win win);
3111-
OMPI_DECLSPEC int PMPI_Get_with_notify(void *origin_addr, int origin_count,
3111+
OMPI_DECLSPEC int PMPI_Get_notify(void *origin_addr, int origin_count,
31123112
MPI_Datatype origin_datatype, int target_rank,
31133113
MPI_Aint target_disp, int target_count,
31143114
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
3115-
OMPI_DECLSPEC int PMPI_Get_with_notify_c(void *origin_addr, MPI_Count origin_count,
3115+
OMPI_DECLSPEC int PMPI_Get_notify_c(void *origin_addr, MPI_Count origin_count,
31163116
MPI_Datatype origin_datatype, int target_rank,
31173117
MPI_Aint target_disp, MPI_Count target_count,
31183118
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
@@ -3379,10 +3379,10 @@ OMPI_DECLSPEC int PMPI_Put(const void *origin_addr, int origin_count, MPI_Datat
33793379
OMPI_DECLSPEC int PMPI_Put_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
33803380
int target_rank, MPI_Aint target_disp, MPI_Count target_count,
33813381
MPI_Datatype target_datatype, MPI_Win win);
3382-
OMPI_DECLSPEC int PMPI_Put_with_notify(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
3382+
OMPI_DECLSPEC int PMPI_Put_notify(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
33833383
int target_rank, MPI_Aint target_disp, int target_count,
33843384
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
3385-
OMPI_DECLSPEC int PMPI_Put_with_notify_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
3385+
OMPI_DECLSPEC int PMPI_Put_notify_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
33863386
int target_rank, MPI_Aint target_disp, MPI_Count target_count,
33873387
MPI_Datatype target_datatype, int notification_idx, MPI_Win win);
33883388
OMPI_DECLSPEC int PMPI_Query_thread(int *provided);

‎ompi/include/mpif-values.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@
301301
'MPI_ERR_SESSION': 78,
302302
'MPI_ERR_VALUE_TOO_LARGE': 79,
303303
'MPI_ERR_ERRHANDLER': 80,
304-
'MPI_ERR_LASTCODE': 92,
305304
'MPI_ERR_NOTIFY_IDX': 81,
305+
'MPI_ERR_LASTCODE': 92,
306306
'MPI_IDENT': 0,
307307
'MPI_CONGRUENT': 1,
308308
'MPI_SIMILAR': 2,

‎ompi/mca/osc/osc.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ typedef int (*ompi_osc_base_module_put_fn_t)(const void *origin_addr,
216216
struct ompi_datatype_t *target_dt,
217217
struct ompi_win_t *win);
218218

219-
typedef int (*ompi_osc_base_module_put_with_notify_fn_t)(const void *origin_addr,
219+
typedef int (*ompi_osc_base_module_put_notify_fn_t)(const void *origin_addr,
220220
size_t origin_count,
221221
struct ompi_datatype_t *origin_dt,
222222
int target,
@@ -235,7 +235,7 @@ typedef int (*ompi_osc_base_module_get_fn_t)(void *origin_addr,
235235
struct ompi_datatype_t *target_dt,
236236
struct ompi_win_t *win);
237237

238-
typedef int (*ompi_osc_base_module_get_with_notify_fn_t)(void *origin_addr,
238+
typedef int (*ompi_osc_base_module_get_notify_fn_t)(void *origin_addr,
239239
size_t origin_count,
240240
struct ompi_datatype_t *origin_dt,
241241
int target,
@@ -294,7 +294,7 @@ typedef int (*ompi_osc_base_module_rput_fn_t)(const void *origin_addr,
294294
struct ompi_win_t *win,
295295
struct ompi_request_t **request);
296296

297-
typedef int (*ompi_osc_base_module_rput_with_notify_fn_t)(const void *origin_addr,
297+
typedef int (*ompi_osc_base_module_rput_notify_fn_t)(const void *origin_addr,
298298
size_t origin_count,
299299
struct ompi_datatype_t *origin_dt,
300300
int target,
@@ -315,7 +315,7 @@ typedef int (*ompi_osc_base_module_rget_fn_t)(void *origin_addr,
315315
struct ompi_win_t *win,
316316
struct ompi_request_t **request);
317317

318-
typedef int (*ompi_osc_base_module_rget_with_notify_fn_t)(void *origin_addr,
318+
typedef int (*ompi_osc_base_module_rget_notify_fn_t)(void *origin_addr,
319319
size_t origin_count,
320320
struct ompi_datatype_t *origin_dt,
321321
int target,
@@ -418,18 +418,18 @@ struct ompi_osc_base_module_4_0_0_t {
418418
ompi_osc_base_module_free_fn_t osc_free;
419419

420420
ompi_osc_base_module_put_fn_t osc_put;
421-
ompi_osc_base_module_put_with_notify_fn_t osc_put_with_notify;
421+
ompi_osc_base_module_put_notify_fn_t osc_put_notify;
422422
ompi_osc_base_module_get_fn_t osc_get;
423-
ompi_osc_base_module_get_with_notify_fn_t osc_get_with_notify;
423+
ompi_osc_base_module_get_notify_fn_t osc_get_notify;
424424
ompi_osc_base_module_accumulate_fn_t osc_accumulate;
425425
ompi_osc_base_module_compare_and_swap_fn_t osc_compare_and_swap;
426426
ompi_osc_base_module_fetch_and_op_fn_t osc_fetch_and_op;
427427
ompi_osc_base_module_get_accumulate_fn_t osc_get_accumulate;
428428

429429
ompi_osc_base_module_rput_fn_t osc_rput;
430-
ompi_osc_base_module_rput_with_notify_fn_t osc_rput_with_notify;
430+
ompi_osc_base_module_rput_notify_fn_t osc_rput_notify;
431431
ompi_osc_base_module_rget_fn_t osc_rget;
432-
ompi_osc_base_module_rget_with_notify_fn_t osc_rget_with_notify;
432+
ompi_osc_base_module_rget_notify_fn_t osc_rget_notify;
433433
ompi_osc_base_module_raccumulate_fn_t osc_raccumulate;
434434
ompi_osc_base_module_rget_accumulate_fn_t osc_rget_accumulate;
435435

‎ompi/mca/osc/sm/osc_sm.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ int ompi_osc_sm_detach(struct ompi_win_t *win, const void *base);
107107

108108
int ompi_osc_sm_free(struct ompi_win_t *win);
109109

110-
// TODO: add put/get_with_notify prototypes
110+
// TODO: add put/get_notify prototypes
111111

112112
int ompi_osc_sm_put(const void *origin_addr,
113113
size_t origin_count,
@@ -118,7 +118,7 @@ int ompi_osc_sm_put(const void *origin_addr,
118118
struct ompi_datatype_t *target_dt,
119119
struct ompi_win_t *win);
120120

121-
int ompi_osc_sm_put_with_notify(const void *origin_addr,
121+
int ompi_osc_sm_put_notify(const void *origin_addr,
122122
size_t origin_count,
123123
struct ompi_datatype_t *origin_dt,
124124
int target,
@@ -137,7 +137,7 @@ int ompi_osc_sm_get(void *origin_addr,
137137
struct ompi_datatype_t *target_dt,
138138
struct ompi_win_t *win);
139139

140-
int ompi_osc_sm_get_with_notify(void *origin_addr,
140+
int ompi_osc_sm_get_notify(void *origin_addr,
141141
size_t origin_count,
142142
struct ompi_datatype_t *origin_dt,
143143
int target,
@@ -196,7 +196,7 @@ int ompi_osc_sm_rput(const void *origin_addr,
196196
struct ompi_win_t *win,
197197
struct ompi_request_t **request);
198198

199-
int ompi_osc_sm_rput_with_notify(const void *origin_addr,
199+
int ompi_osc_sm_rput_notify(const void *origin_addr,
200200
size_t origin_count,
201201
struct ompi_datatype_t *origin_dt,
202202
int target,
@@ -217,7 +217,7 @@ int ompi_osc_sm_rget(void *origin_addr,
217217
struct ompi_win_t *win,
218218
struct ompi_request_t **request);
219219

220-
int ompi_osc_sm_rget_with_notify(void *origin_addr,
220+
int ompi_osc_sm_rget_notify(void *origin_addr,
221221
size_t origin_count,
222222
struct ompi_datatype_t *origin_dt,
223223
int target,

‎ompi/mca/osc/sm/osc_sm_comm.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ompi_osc_sm_rput(const void *origin_addr,
6060
}
6161

6262
int
63-
ompi_osc_sm_rput_with_notify(const void *origin_addr,
63+
ompi_osc_sm_rput_notify(const void *origin_addr,
6464
size_t origin_count,
6565
struct ompi_datatype_t *origin_dt,
6666
int target,
@@ -143,7 +143,7 @@ ompi_osc_sm_rget(void *origin_addr,
143143
}
144144

145145
int
146-
ompi_osc_sm_rget_with_notify(void *origin_addr,
146+
ompi_osc_sm_rget_notify(void *origin_addr,
147147
size_t origin_count,
148148
struct ompi_datatype_t *origin_dt,
149149
int target,
@@ -323,7 +323,7 @@ ompi_osc_sm_put(const void *origin_addr,
323323

324324

325325
int
326-
ompi_osc_sm_put_with_notify(const void *origin_addr,
326+
ompi_osc_sm_put_notify(const void *origin_addr,
327327
size_t origin_count,
328328
struct ompi_datatype_t *origin_dt,
329329
int target,
@@ -392,7 +392,7 @@ ompi_osc_sm_get(void *origin_addr,
392392

393393

394394
int
395-
ompi_osc_sm_get_with_notify(void *origin_addr,
395+
ompi_osc_sm_get_notify(void *origin_addr,
396396
size_t origin_count,
397397
struct ompi_datatype_t *origin_dt,
398398
int target,

‎ompi/mca/osc/sm/osc_sm_component.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ ompi_osc_sm_module_t ompi_osc_sm_module_template = {
7979
.osc_free = ompi_osc_sm_free,
8080

8181
.osc_put = ompi_osc_sm_put,
82-
.osc_put_with_notify = ompi_osc_sm_put_with_notify,
82+
.osc_put_notify = ompi_osc_sm_put_notify,
8383
.osc_get = ompi_osc_sm_get,
84-
.osc_get_with_notify = ompi_osc_sm_get_with_notify,
84+
.osc_get_notify = ompi_osc_sm_get_notify,
8585
.osc_accumulate = ompi_osc_sm_accumulate,
8686
.osc_compare_and_swap = ompi_osc_sm_compare_and_swap,
8787
.osc_fetch_and_op = ompi_osc_sm_fetch_and_op,
8888
.osc_get_accumulate = ompi_osc_sm_get_accumulate,
8989

9090
.osc_rput = ompi_osc_sm_rput,
91-
.osc_rput_with_notify = ompi_osc_sm_rput_with_notify,
91+
.osc_rput_notify = ompi_osc_sm_rput_notify,
9292
.osc_rget = ompi_osc_sm_rget,
93-
.osc_rget_with_notify = ompi_osc_sm_rget_with_notify,
93+
.osc_rget_notify = ompi_osc_sm_rget_notify,
9494
.osc_raccumulate = ompi_osc_sm_raccumulate,
9595
.osc_rget_accumulate = ompi_osc_sm_rget_accumulate,
9696

‎ompi/mpi/c/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ prototype_sources = \
220220
get_accumulate.c.in \
221221
get_address.c.in \
222222
get.c.in \
223-
get_with_notify.c.in \
223+
get_notify.c.in \
224224
get_count.c.in \
225225
get_elements.c.in \
226226
get_elements_x.c.in \
@@ -339,7 +339,7 @@ prototype_sources = \
339339
psend_init.c.in \
340340
publish_name.c.in \
341341
put.c.in \
342-
put_with_notify.c.in \
342+
put_notify.c.in \
343343
query_thread.c.in \
344344
raccumulate.c.in \
345345
recv.c.in \

‎ompi/mpi/c/get_with_notify.c.in‎ renamed to ‎ompi/mpi/c/get_notify.c.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
#include "ompi/datatype/ompi_datatype.h"
3535
#include "ompi/runtime/ompi_spc.h"
3636

37-
PROTOTYPE ERROR_CLASS get_with_notify(BUFFER_OUT origin_addr, COUNT origin_count,
37+
PROTOTYPE ERROR_CLASS get_notify(BUFFER_OUT origin_addr, COUNT origin_count,
3838
DATATYPE origin_datatype, INT target_rank,
3939
AINT target_disp, COUNT target_count,
4040
DATATYPE target_datatype, INT notification_idx, WIN win)
4141
{
4242
int rc;
4343

44-
SPC_RECORD(OMPI_SPC_GET_WITH_NOTIFY, 1);
44+
SPC_RECORD(OMPI_SPC_GET_NOTIFY, 1);
4545

4646
if (MPI_PARAM_CHECK) {
4747
rc = OMPI_SUCCESS;
@@ -70,7 +70,7 @@ PROTOTYPE ERROR_CLASS get_with_notify(BUFFER_OUT origin_addr, COUNT origin_count
7070

7171
if (MPI_PROC_NULL == target_rank) return MPI_SUCCESS;
7272

73-
rc = win->w_osc_module->osc_get_with_notify(origin_addr, origin_count, origin_datatype,
73+
rc = win->w_osc_module->osc_get_notify(origin_addr, origin_count, origin_datatype,
7474
target_rank, target_disp, target_count,
7575
target_datatype, notification_idx, win);
7676
OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);

‎ompi/mpi/c/put_with_notify.c.in‎ renamed to ‎ompi/mpi/c/put_notify.c.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
#include "ompi/datatype/ompi_datatype.h"
3636
#include "ompi/runtime/ompi_spc.h"
3737

38-
PROTOTYPE ERROR_CLASS put_with_notify(BUFFER origin_addr, COUNT origin_count, DATATYPE origin_datatype,
38+
PROTOTYPE ERROR_CLASS put_notify(BUFFER origin_addr, COUNT origin_count, DATATYPE origin_datatype,
3939
INT target_rank, AINT target_disp, COUNT target_count,
4040
DATATYPE target_datatype, INT notification_idx, WIN win)
4141
{
4242
int rc;
4343

44-
SPC_RECORD(OMPI_SPC_PUT_WITH_NOTIFY, 1);
44+
SPC_RECORD(OMPI_SPC_PUT_NOTIFY, 1);
4545

4646
if (MPI_PARAM_CHECK) {
4747
rc = OMPI_SUCCESS;
@@ -73,7 +73,7 @@ PROTOTYPE ERROR_CLASS put_with_notify(BUFFER origin_addr, COUNT origin_count, DA
7373

7474
if (MPI_PROC_NULL == target_rank) return MPI_SUCCESS;
7575

76-
rc = win->w_osc_module->osc_put_with_notify(origin_addr, origin_count, origin_datatype,
76+
rc = win->w_osc_module->osc_put_notify(origin_addr, origin_count, origin_datatype,
7777
target_rank, target_disp, target_count,
7878
target_datatype, notification_idx, win);
7979
OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);

‎ompi/runtime/ompi_spc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ static const ompi_spc_event_t ompi_spc_events_desc[OMPI_SPC_NUM_COUNTERS] = {
7171
SET_COUNTER_ARRAY(OMPI_SPC_SENDRECV, "The number of times MPI_Sendrecv was called.", false, false),
7272
SET_COUNTER_ARRAY(OMPI_SPC_SENDRECV_REPLACE, "The number of times MPI_Sendrecv_replace was called.", false, false),
7373
SET_COUNTER_ARRAY(OMPI_SPC_PUT, "The number of times MPI_Put was called.", false, false),
74-
SET_COUNTER_ARRAY(OMPI_SPC_PUT_WITH_NOTIFY, "The number of times MPI_Put_with_notify was called.", false, false),
74+
SET_COUNTER_ARRAY(OMPI_SPC_PUT_NOTIFY, "The number of times MPI_Put_notify was called.", false, false),
7575
SET_COUNTER_ARRAY(OMPI_SPC_RPUT, "The number of times MPI_Rput was called.", false, false),
7676
SET_COUNTER_ARRAY(OMPI_SPC_GET, "The number of times MPI_Get was called.", false, false),
77-
SET_COUNTER_ARRAY(OMPI_SPC_GET_WITH_NOTIFY, "The number of times MPI_Get was called.", false, false),
77+
SET_COUNTER_ARRAY(OMPI_SPC_GET_NOTIFY, "The number of times MPI_Get was called.", false, false),
7878
SET_COUNTER_ARRAY(OMPI_SPC_RGET, "The number of times MPI_Rget was called.", false, false),
7979
SET_COUNTER_ARRAY(OMPI_SPC_PROBE, "The number of times MPI_Probe was called.", false, false),
8080
SET_COUNTER_ARRAY(OMPI_SPC_IPROBE, "The number of times MPI_Iprobe was called.", false, false),

0 commit comments

Comments
 (0)