Skip to content

Commit 9fecace

Browse files
hppritchahppritcha
authored
Merge pull request #9065 from ggouaillardet/topic/persistent_collective_rename
MPI4: move pcollreq into the MPI namespace
2 parents 6cfb9fc + 42220e2 commit 9fecace

File tree

188 files changed

+3351
-5651
lines changed

Some content is hidden

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

188 files changed

+3351
-5651
lines changed

‎ompi/include/mpi.h.in‎

Lines changed: 222 additions & 110 deletions
Large diffs are not rendered by default.

‎ompi/mpi/c/Makefile.am‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,32 @@ libmpi_c_mpi_la_SOURCES = \
6767
add_error_string.c \
6868
allgather.c \
6969
iallgather.c \
70+
allgather_init.c \
7071
allgatherv.c \
7172
iallgatherv.c \
73+
allgatherv_init.c \
7274
alloc_mem.c \
7375
allreduce.c \
7476
iallreduce.c \
77+
allreduce_init.c \
7578
alltoall.c \
7679
ialltoall.c \
80+
alltoall_init.c \
7781
alltoallv.c \
7882
ialltoallv.c \
83+
alltoallv_init.c \
7984
alltoallw.c \
8085
ialltoallw.c \
86+
alltoallw_init.c \
8187
attr_delete.c \
8288
attr_get.c \
8389
attr_put.c \
8490
barrier.c \
8591
ibarrier.c \
92+
barrier_init.c \
8693
bcast.c \
8794
ibcast.c \
95+
bcast_init.c \
8896
bsend.c \
8997
bsend_init.c \
9098
buffer_attach.c \
@@ -148,8 +156,9 @@ libmpi_c_mpi_la_SOURCES = \
148156
error_class.c \
149157
error_string.c \
150158
exscan.c \
151-
fetch_and_op.c \
152159
iexscan.c \
160+
exscan_init.c \
161+
fetch_and_op.c \
153162
file_c2f.c \
154163
file_call_errhandler.c \
155164
file_close.c \
@@ -216,8 +225,10 @@ libmpi_c_mpi_la_SOURCES = \
216225
free_mem.c \
217226
gather.c \
218227
igather.c \
228+
gather_init.c \
219229
gatherv.c \
220230
igatherv.c \
231+
gatherv_init.c \
221232
get_address.c \
222233
get_count.c \
223234
get_elements.c \
@@ -280,14 +291,19 @@ libmpi_c_mpi_la_SOURCES = \
280291
mrecv.c \
281292
neighbor_allgather.c \
282293
ineighbor_allgather.c \
294+
neighbor_allgather_init.c \
283295
neighbor_allgatherv.c \
284296
ineighbor_allgatherv.c \
297+
neighbor_allgatherv_init.c \
285298
neighbor_alltoall.c \
286299
ineighbor_alltoall.c \
300+
neighbor_alltoall_init.c \
287301
neighbor_alltoallv.c \
288302
ineighbor_alltoallv.c \
303+
neighbor_alltoallv_init.c \
289304
neighbor_alltoallw.c \
290305
ineighbor_alltoallw.c \
306+
neighbor_alltoallw_init.c \
291307
keyval_create.c \
292308
keyval_free.c \
293309
op_c2f.c \
@@ -314,13 +330,16 @@ libmpi_c_mpi_la_SOURCES = \
314330
recv_init.c \
315331
recv.c \
316332
reduce.c \
317-
register_datarep.c \
318333
ireduce.c \
334+
reduce_init.c \
335+
register_datarep.c \
319336
reduce_local.c \
320337
reduce_scatter.c \
321338
ireduce_scatter.c \
339+
reduce_scatter_init.c \
322340
reduce_scatter_block.c \
323341
ireduce_scatter_block.c \
342+
reduce_scatter_block_init.c \
324343
request_c2f.c \
325344
request_f2c.c \
326345
request_free.c \
@@ -332,10 +351,13 @@ libmpi_c_mpi_la_SOURCES = \
332351
rsend.c \
333352
scan.c \
334353
iscan.c \
354+
scan_init.c \
335355
scatter.c \
336356
iscatter.c \
357+
scatter_init.c \
337358
scatterv.c \
338359
iscatterv.c \
360+
scatterv_init.c \
339361
send.c \
340362
send_init.c \
341363
sendrecv.c \

‎ompi/mpiext/pcollreq/c/allgather_init.c‎ renamed to ‎ompi/mpi/c/allgather_init.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,21 @@
3333
#include "ompi/datatype/ompi_datatype.h"
3434
#include "ompi/mca/coll/base/coll_base_util.h"
3535
#include "ompi/memchecker.h"
36-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3736
#include "ompi/runtime/ompi_spc.h"
3837

3938
#if OMPI_BUILD_MPI_PROFILING
4039
#if OPAL_HAVE_WEAK_SYMBOLS
41-
#pragma weak MPIX_Allgather_init = PMPIX_Allgather_init
40+
#pragma weak MPI_Allgather_init = PMPI_Allgather_init
4241
#endif
43-
#define MPIX_Allgather_init PMPIX_Allgather_init
42+
#define MPI_Allgather_init PMPI_Allgather_init
4443
#endif
4544

46-
static const char FUNC_NAME[] = "MPIX_Allgather_init";
45+
static const char FUNC_NAME[] = "MPI_Allgather_init";
4746

4847

49-
int MPIX_Allgather_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
50-
void *recvbuf, int recvcount, MPI_Datatype recvtype,
51-
MPI_Comm comm, MPI_Info info, MPI_Request *request)
48+
int MPI_Allgather_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
49+
void *recvbuf, int recvcount, MPI_Datatype recvtype,
50+
MPI_Comm comm, MPI_Info info, MPI_Request *request)
5251
{
5352
int err;
5453

‎ompi/mpiext/pcollreq/c/allgatherv_init.c‎ renamed to ‎ompi/mpi/c/allgatherv_init.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,22 @@
3333
#include "ompi/datatype/ompi_datatype.h"
3434
#include "ompi/mca/coll/base/coll_base_util.h"
3535
#include "ompi/memchecker.h"
36-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3736
#include "ompi/runtime/ompi_spc.h"
3837

3938
#if OMPI_BUILD_MPI_PROFILING
4039
#if OPAL_HAVE_WEAK_SYMBOLS
41-
#pragma weak MPIX_Allgatherv_init = PMPIX_Allgatherv_init
40+
#pragma weak MPI_Allgatherv_init = PMPI_Allgatherv_init
4241
#endif
43-
#define MPIX_Allgatherv_init PMPIX_Allgatherv_init
42+
#define MPI_Allgatherv_init PMPI_Allgatherv_init
4443
#endif
4544

46-
static const char FUNC_NAME[] = "MPIX_Allgatherv_init";
45+
static const char FUNC_NAME[] = "MPI_Allgatherv_init";
4746

4847

49-
int MPIX_Allgatherv_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
50-
void *recvbuf, const int recvcounts[], const int displs[],
51-
MPI_Datatype recvtype, MPI_Comm comm,
52-
MPI_Info info, MPI_Request *request)
48+
int MPI_Allgatherv_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
49+
void *recvbuf, const int recvcounts[], const int displs[],
50+
MPI_Datatype recvtype, MPI_Comm comm,
51+
MPI_Info info, MPI_Request *request)
5352
{
5453
int i, size, err;
5554

‎ompi/mpiext/pcollreq/c/allreduce_init.c‎ renamed to ‎ompi/mpi/c/allreduce_init.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,21 @@
3434
#include "ompi/op/op.h"
3535
#include "ompi/mca/coll/base/coll_base_util.h"
3636
#include "ompi/memchecker.h"
37-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3837
#include "ompi/runtime/ompi_spc.h"
3938

4039
#if OMPI_BUILD_MPI_PROFILING
4140
#if OPAL_HAVE_WEAK_SYMBOLS
42-
#pragma weak MPIX_Allreduce_init = PMPIX_Allreduce_init
41+
#pragma weak MPI_Allreduce_init = PMPI_Allreduce_init
4342
#endif
44-
#define MPIX_Allreduce_init PMPIX_Allreduce_init
43+
#define MPI_Allreduce_init PMPI_Allreduce_init
4544
#endif
4645

47-
static const char FUNC_NAME[] = "MPIX_Allreduce_init";
46+
static const char FUNC_NAME[] = "MPI_Allreduce_init";
4847

4948

50-
int MPIX_Allreduce_init(const void *sendbuf, void *recvbuf, int count,
51-
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm,
52-
MPI_Info info, MPI_Request *request)
49+
int MPI_Allreduce_init(const void *sendbuf, void *recvbuf, int count,
50+
MPI_Datatype datatype, MPI_Op op, MPI_Comm comm,
51+
MPI_Info info, MPI_Request *request)
5352
{
5453
int err;
5554

‎ompi/mpiext/pcollreq/c/alltoall_init.c‎ renamed to ‎ompi/mpi/c/alltoall_init.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,21 @@
3333
#include "ompi/datatype/ompi_datatype.h"
3434
#include "ompi/mca/coll/base/coll_base_util.h"
3535
#include "ompi/memchecker.h"
36-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3736
#include "ompi/runtime/ompi_spc.h"
3837

3938
#if OMPI_BUILD_MPI_PROFILING
4039
#if OPAL_HAVE_WEAK_SYMBOLS
41-
#pragma weak MPIX_Alltoall_init = PMPIX_Alltoall_init
40+
#pragma weak MPI_Alltoall_init = PMPI_Alltoall_init
4241
#endif
43-
#define MPIX_Alltoall_init PMPIX_Alltoall_init
42+
#define MPI_Alltoall_init PMPI_Alltoall_init
4443
#endif
4544

46-
static const char FUNC_NAME[] = "MPIX_Alltoall_init";
45+
static const char FUNC_NAME[] = "MPI_Alltoall_init";
4746

4847

49-
int MPIX_Alltoall_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
50-
void *recvbuf, int recvcount, MPI_Datatype recvtype,
51-
MPI_Comm comm, MPI_Info info, MPI_Request *request)
48+
int MPI_Alltoall_init(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
49+
void *recvbuf, int recvcount, MPI_Datatype recvtype,
50+
MPI_Comm comm, MPI_Info info, MPI_Request *request)
5251
{
5352
size_t sendtype_size, recvtype_size;
5453
int err;

‎ompi/mpiext/pcollreq/c/alltoallv_init.c‎ renamed to ‎ompi/mpi/c/alltoallv_init.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,22 @@
3232
#include "ompi/datatype/ompi_datatype.h"
3333
#include "ompi/mca/coll/base/coll_base_util.h"
3434
#include "ompi/memchecker.h"
35-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3635
#include "ompi/runtime/ompi_spc.h"
3736

3837
#if OMPI_BUILD_MPI_PROFILING
3938
#if OPAL_HAVE_WEAK_SYMBOLS
40-
#pragma weak MPIX_Alltoallv_init = PMPIX_Alltoallv_init
39+
#pragma weak MPI_Alltoallv_init = PMPI_Alltoallv_init
4140
#endif
42-
#define MPIX_Alltoallv_init PMPIX_Alltoallv_init
41+
#define MPI_Alltoallv_init PMPI_Alltoallv_init
4342
#endif
4443

45-
static const char FUNC_NAME[] = "MPIX_Alltoallv_init";
44+
static const char FUNC_NAME[] = "MPI_Alltoallv_init";
4645

4746

48-
int MPIX_Alltoallv_init(const void *sendbuf, const int sendcounts[], const int sdispls[],
49-
MPI_Datatype sendtype, void *recvbuf, const int recvcounts[],
50-
const int rdispls[], MPI_Datatype recvtype, MPI_Comm comm,
51-
MPI_Info info, MPI_Request *request)
47+
int MPI_Alltoallv_init(const void *sendbuf, const int sendcounts[], const int sdispls[],
48+
MPI_Datatype sendtype, void *recvbuf, const int recvcounts[],
49+
const int rdispls[], MPI_Datatype recvtype, MPI_Comm comm,
50+
MPI_Info info, MPI_Request *request)
5251
{
5352
int i, size, err;
5453

‎ompi/mpiext/pcollreq/c/alltoallw_init.c‎ renamed to ‎ompi/mpi/c/alltoallw_init.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,22 @@
3232
#include "ompi/datatype/ompi_datatype.h"
3333
#include "ompi/mca/coll/base/coll_base_util.h"
3434
#include "ompi/memchecker.h"
35-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3635
#include "ompi/runtime/ompi_spc.h"
3736

3837
#if OMPI_BUILD_MPI_PROFILING
3938
#if OPAL_HAVE_WEAK_SYMBOLS
40-
#pragma weak MPIX_Alltoallw_init = PMPIX_Alltoallw_init
39+
#pragma weak MPI_Alltoallw_init = PMPI_Alltoallw_init
4140
#endif
42-
#define MPIX_Alltoallw_init PMPIX_Alltoallw_init
41+
#define MPI_Alltoallw_init PMPI_Alltoallw_init
4342
#endif
4443

45-
static const char FUNC_NAME[] = "MPIX_Alltoallw_init";
44+
static const char FUNC_NAME[] = "MPI_Alltoallw_init";
4645

4746

48-
int MPIX_Alltoallw_init(const void *sendbuf, const int sendcounts[], const int sdispls[],
49-
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
50-
const int rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm,
51-
MPI_Info info, MPI_Request *request)
47+
int MPI_Alltoallw_init(const void *sendbuf, const int sendcounts[], const int sdispls[],
48+
const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[],
49+
const int rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm,
50+
MPI_Info info, MPI_Request *request)
5251
{
5352
int i, size, err;
5453

‎ompi/mpiext/pcollreq/c/barrier_init.c‎ renamed to ‎ompi/mpi/c/barrier_init.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,19 @@
2727
#include "ompi/errhandler/errhandler.h"
2828
#include "ompi/datatype/ompi_datatype.h"
2929
#include "ompi/memchecker.h"
30-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
3130
#include "ompi/runtime/ompi_spc.h"
3231

3332
#if OMPI_BUILD_MPI_PROFILING
3433
#if OPAL_HAVE_WEAK_SYMBOLS
35-
#pragma weak MPIX_Barrier_init = PMPIX_Barrier_init
34+
#pragma weak MPI_Barrier_init = PMPI_Barrier_init
3635
#endif
37-
#define MPIX_Barrier_init PMPIX_Barrier_init
36+
#define MPI_Barrier_init PMPI_Barrier_init
3837
#endif
3938

40-
static const char FUNC_NAME[] = "MPIX_Barrier_init";
39+
static const char FUNC_NAME[] = "MPI_Barrier_init";
4140

4241

43-
int MPIX_Barrier_init(MPI_Comm comm, MPI_Info info, MPI_Request *request)
42+
int MPI_Barrier_init(MPI_Comm comm, MPI_Info info, MPI_Request *request)
4443
{
4544
int err = MPI_SUCCESS;
4645

‎ompi/mpiext/pcollreq/c/bcast_init.c‎ renamed to ‎ompi/mpi/c/bcast_init.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
#include "ompi/datatype/ompi_datatype.h"
2222
#include "ompi/mca/coll/base/coll_base_util.h"
2323
#include "ompi/memchecker.h"
24-
#include "ompi/mpiext/pcollreq/c/mpiext_pcollreq_c.h"
2524
#include "ompi/runtime/ompi_spc.h"
2625

2726
#if OMPI_BUILD_MPI_PROFILING
2827
#if OPAL_HAVE_WEAK_SYMBOLS
29-
#pragma weak MPIX_Bcast_init = PMPIX_Bcast_init
28+
#pragma weak MPI_Bcast_init = PMPI_Bcast_init
3029
#endif
31-
#define MPIX_Bcast_init PMPIX_Bcast_init
30+
#define MPI_Bcast_init PMPI_Bcast_init
3231
#endif
3332

34-
static const char FUNC_NAME[] = "MPIX_Bcast_init";
33+
static const char FUNC_NAME[] = "MPI_Bcast_init";
3534

3635

37-
int MPIX_Bcast_init(void *buffer, int count, MPI_Datatype datatype,
38-
int root, MPI_Comm comm, MPI_Info info, MPI_Request *request)
36+
int MPI_Bcast_init(void *buffer, int count, MPI_Datatype datatype,
37+
int root, MPI_Comm comm, MPI_Info info, MPI_Request *request)
3938
{
4039
int err;
4140

0 commit comments

Comments
 (0)