Skip to content

Commit a602f23

Browse files
ggouaillardetggouaillardet
committed
Persistent Collectives rename: mpif-h bindings
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent a55863e commit a602f23

34 files changed

+940
-1201
lines changed

‎ompi/mpi/fortran/mpif-h/Makefile.am

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,25 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
136136
aint_add_f.c \
137137
aint_diff_f.c \
138138
allgather_f.c \
139+
allgather_init_f.c \
139140
allgatherv_f.c \
141+
allgatherv_init_f.c \
140142
alloc_mem_f.c \
141143
allreduce_f.c \
144+
allreduce_init_f.c \
142145
alltoall_f.c \
146+
alltoall_init_f.c \
143147
alltoallv_f.c \
148+
alltoallv_init_f.c \
144149
alltoallw_f.c \
150+
alltoallw_init_f.c \
145151
attr_delete_f.c \
146152
attr_get_f.c \
147153
attr_put_f.c \
148154
barrier_f.c \
155+
barrier_init_f.c \
149156
bcast_f.c \
157+
bcast_init_f.c \
150158
bsend_f.c \
151159
bsend_init_f.c \
152160
buffer_attach_f.c \
@@ -205,6 +213,7 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
205213
error_class_f.c \
206214
error_string_f.c \
207215
exscan_f.c \
216+
exscan_init_f.c \
208217
f_sync_reg_f.c \
209218
file_call_errhandler_f.c \
210219
file_close_f.c \
@@ -269,7 +278,9 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
269278
finalize_f.c \
270279
free_mem_f.c \
271280
gather_f.c \
281+
gather_init_f.c \
272282
gatherv_f.c \
283+
gatherv_init_f.c \
273284
get_address_f.c \
274285
get_count_f.c \
275286
get_elements_f.c \
@@ -348,10 +359,15 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
348359
mprobe_f.c \
349360
mrecv_f.c \
350361
neighbor_allgather_f.c \
362+
neighbor_allgather_init_f.c \
351363
neighbor_allgatherv_f.c \
364+
neighbor_allgatherv_init_f.c \
352365
neighbor_alltoall_f.c \
366+
neighbor_alltoall_init_f.c \
353367
neighbor_alltoallv_f.c \
368+
neighbor_alltoallv_init_f.c \
354369
neighbor_alltoallw_f.c \
370+
neighbor_alltoallw_init_f.c \
355371
op_commutative_f.c \
356372
op_create_f.c \
357373
open_port_f.c \
@@ -373,17 +389,23 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
373389
recv_f.c \
374390
recv_init_f.c \
375391
reduce_f.c \
392+
reduce_init_f.c \
376393
reduce_local_f.c \
377394
reduce_scatter_f.c \
395+
reduce_scatter_init_f.c \
378396
reduce_scatter_block_f.c \
397+
reduce_scatter_block_init_f.c \
379398
register_datarep_f.c \
380399
request_free_f.c \
381400
request_get_status_f.c \
382401
rsend_f.c \
383402
rsend_init_f.c \
384403
scan_f.c \
404+
scan_init_f.c \
385405
scatter_f.c \
406+
scatter_init_f.c \
386407
scatterv_f.c \
408+
scatterv_init_f.c \
387409
send_f.c \
388410
send_init_f.c \
389411
sendrecv_f.c \

‎ompi/mpiext/pcollreq/mpif-h/alltoall_init_f.c renamed to ‎ompi/mpi/fortran/mpif-h/allgather_init_f.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015-2018 Research Organization for Information Science
14-
* and Technology (RIST). All rights reserved.
13+
* Copyright (c) 2015-2021 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
1717
* Additional copyrights may follow
@@ -23,56 +23,55 @@
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/mpi/fortran/base/constants.h"
26-
#include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
2726

2827
#if OMPI_BUILD_MPI_PROFILING
2928
#if OPAL_HAVE_WEAK_SYMBOLS
30-
#pragma weak PMPIX_ALLTOALL_INIT = ompix_alltoall_init_f
31-
#pragma weak pmpix_alltoall_init = ompix_alltoall_init_f
32-
#pragma weak pmpix_alltoall_init_ = ompix_alltoall_init_f
33-
#pragma weak pmpix_alltoall_init__ = ompix_alltoall_init_f
29+
#pragma weak PMPI_ALLGATHER_INIT = ompi_allgather_init_f
30+
#pragma weak pmpi_allgather_init = ompi_allgather_init_f
31+
#pragma weak pmpi_allgather_init_ = ompi_allgather_init_f
32+
#pragma weak pmpi_allgather_init__ = ompi_allgather_init_f
3433

35-
#pragma weak PMPIX_Alltoall_init_f = ompix_alltoall_init_f
36-
#pragma weak PMPIX_Alltoall_init_f08 = ompix_alltoall_init_f
34+
#pragma weak PMPI_Allgather_init_f = ompi_allgather_init_f
35+
#pragma weak PMPI_Allgather_init_f08 = ompi_allgather_init_f
3736
#else
38-
OMPI_GENERATE_F77_BINDINGS (PMPIX_ALLTOALL_INIT,
39-
pmpix_alltoall_init,
40-
pmpix_alltoall_init_,
41-
pmpix_alltoall_init__,
42-
pompix_alltoall_init_f,
37+
OMPI_GENERATE_F77_BINDINGS (PMPI_ALLGATHER_INIT,
38+
pmpi_allgather_init,
39+
pmpi_allgather_init_,
40+
pmpi_allgather_init__,
41+
pompi_allgather_init_f,
4342
(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr),
4443
(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, info, request, ierr) )
4544
#endif
4645
#endif
4746

4847
#if OPAL_HAVE_WEAK_SYMBOLS
49-
#pragma weak MPIX_ALLTOALL_INIT = ompix_alltoall_init_f
50-
#pragma weak mpix_alltoall_init = ompix_alltoall_init_f
51-
#pragma weak mpix_alltoall_init_ = ompix_alltoall_init_f
52-
#pragma weak mpix_alltoall_init__ = ompix_alltoall_init_f
48+
#pragma weak MPI_ALLGATHER_INIT = ompi_allgather_init_f
49+
#pragma weak mpi_allgather_init = ompi_allgather_init_f
50+
#pragma weak mpi_allgather_init_ = ompi_allgather_init_f
51+
#pragma weak mpi_allgather_init__ = ompi_allgather_init_f
5352

54-
#pragma weak MPIX_Alltoall_init_f = ompix_alltoall_init_f
55-
#pragma weak MPIX_Alltoall_init_f08 = ompix_alltoall_init_f
53+
#pragma weak MPI_Allgather_init_f = ompi_allgather_init_f
54+
#pragma weak MPI_Allgather_init_f08 = ompi_allgather_init_f
5655
#else
5756
#if ! OMPI_BUILD_MPI_PROFILING
58-
OMPI_GENERATE_F77_BINDINGS (MPIX_ALLTOALL_INIT,
59-
mpix_alltoall_init,
60-
mpix_alltoall_init_,
61-
mpix_alltoall_init__,
62-
ompix_alltoall_init_f,
57+
OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHER_INIT,
58+
mpi_allgather_init,
59+
mpi_allgather_init_,
60+
mpi_allgather_init__,
61+
ompi_allgather_init_f,
6362
(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr),
6463
(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, info, request, ierr) )
6564
#else
66-
#define ompix_alltoall_init_f pompix_alltoall_init_f
65+
#define ompi_allgather_init_f pompi_allgather_init_f
6766
#endif
6867
#endif
6968

7069

71-
void ompix_alltoall_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
70+
void ompi_allgather_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
7271
char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype,
7372
MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
7473
{
75-
int c_ierr;
74+
int ierr_c;
7675
MPI_Comm c_comm;
7776
MPI_Request c_req;
7877
MPI_Datatype c_sendtype, c_recvtype;
@@ -87,13 +86,14 @@ void ompix_alltoall_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtyp
8786
sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
8887
recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
8988

90-
c_ierr = PMPIX_Alltoall_init(sendbuf,
89+
ierr_c = PMPI_Allgather_init(sendbuf,
9190
OMPI_FINT_2_INT(*sendcount),
9291
c_sendtype,
9392
recvbuf,
9493
OMPI_FINT_2_INT(*recvcount),
9594
c_recvtype, c_comm, c_info, &c_req);
96-
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
9795

98-
if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_req);
96+
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
97+
98+
if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_req);
9999
}

‎ompi/mpiext/pcollreq/mpif-h/allgatherv_init_f.c renamed to ‎ompi/mpi/fortran/mpif-h/allgatherv_init_f.c

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2015-2018 Research Organization for Information Science
14-
* and Technology (RIST). All rights reserved.
13+
* Copyright (c) 2015-2021 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
1616
*
1717
* Additional copyrights may follow
@@ -23,55 +23,54 @@
2323

2424
#include "ompi/mpi/fortran/mpif-h/bindings.h"
2525
#include "ompi/mpi/fortran/base/constants.h"
26-
#include "ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_prototypes.h"
2726

2827
#if OMPI_BUILD_MPI_PROFILING
2928
#if OPAL_HAVE_WEAK_SYMBOLS
30-
#pragma weak PMPIX_ALLGATHERV_INIT = ompix_allgatherv_init_f
31-
#pragma weak pmpix_allgatherv_init = ompix_allgatherv_init_f
32-
#pragma weak pmpix_allgatherv_init_ = ompix_allgatherv_init_f
33-
#pragma weak pmpix_allgatherv_init__ = ompix_allgatherv_init_f
29+
#pragma weak PMPI_ALLGATHERV_INIT = ompi_allgatherv_init_f
30+
#pragma weak pmpi_allgatherv_init = ompi_allgatherv_init_f
31+
#pragma weak pmpi_allgatherv_init_ = ompi_allgatherv_init_f
32+
#pragma weak pmpi_allgatherv_init__ = ompi_allgatherv_init_f
3433

35-
#pragma weak PMPIX_Allgatherv_init_f = ompix_allgatherv_init_f
36-
#pragma weak PMPIX_Allgatherv_init_f08 = ompix_allgatherv_init_f
34+
#pragma weak PMPI_Allgatherv_init_f = ompi_allgatherv_init_f
35+
#pragma weak PMPI_Allgatherv_init_f08 = ompi_allgatherv_init_f
3736
#else
38-
OMPI_GENERATE_F77_BINDINGS (PMPIX_ALLGATHERV_INIT,
39-
pmpix_allgatherv_init,
40-
pmpix_allgatherv_init_,
41-
pmpix_allgatherv_init__,
42-
pompix_allgatherv_init_f,
37+
OMPI_GENERATE_F77_BINDINGS (PMPI_ALLGATHERV_INIT,
38+
pmpi_allgatherv_init,
39+
pmpi_allgatherv_init_,
40+
pmpi_allgatherv_init__,
41+
pompi_allgatherv_init_f,
4342
(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr),
4443
(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, info, request, ierr) )
4544
#endif
4645
#endif
4746

4847
#if OPAL_HAVE_WEAK_SYMBOLS
49-
#pragma weak MPIX_ALLGATHERV_INIT = ompix_allgatherv_init_f
50-
#pragma weak mpix_allgatherv_init = ompix_allgatherv_init_f
51-
#pragma weak mpix_allgatherv_init_ = ompix_allgatherv_init_f
52-
#pragma weak mpix_allgatherv_init__ = ompix_allgatherv_init_f
48+
#pragma weak MPI_ALLGATHERV_INIT = ompi_allgatherv_init_f
49+
#pragma weak mpi_allgatherv_init = ompi_allgatherv_init_f
50+
#pragma weak mpi_allgatherv_init_ = ompi_allgatherv_init_f
51+
#pragma weak mpi_allgatherv_init__ = ompi_allgatherv_init_f
5352

54-
#pragma weak MPIX_Allgatherv_init_f = ompix_allgatherv_init_f
55-
#pragma weak MPIX_Allgatherv_init_f08 = ompix_allgatherv_init_f
53+
#pragma weak MPI_Allgatherv_init_f = ompi_allgatherv_init_f
54+
#pragma weak MPI_Allgatherv_init_f08 = ompi_allgatherv_init_f
5655
#else
5756
#if ! OMPI_BUILD_MPI_PROFILING
58-
OMPI_GENERATE_F77_BINDINGS (MPIX_ALLGATHERV_INIT,
59-
mpix_allgatherv_init,
60-
mpix_allgatherv_init_,
61-
mpix_allgatherv_init__,
62-
ompix_allgatherv_init_f,
57+
OMPI_GENERATE_F77_BINDINGS (MPI_ALLGATHERV_INIT,
58+
mpi_allgatherv_init,
59+
mpi_allgatherv_init_,
60+
mpi_allgatherv_init__,
61+
ompi_allgatherv_init_f,
6362
(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr),
6463
(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, info, request, ierr) )
6564
#else
66-
#define ompix_allgatherv_init_f pompix_allgatherv_init_f
65+
#define ompi_allgatherv_init_f pompi_allgatherv_init_f
6766
#endif
6867
#endif
6968

7069

71-
void ompix_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
72-
char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs,
73-
MPI_Fint *recvtype, MPI_Fint *comm,
74-
MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
70+
void ompi_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype,
71+
char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs,
72+
MPI_Fint *recvtype, MPI_Fint *comm,
73+
MPI_Fint *info, MPI_Fint *request, MPI_Fint *ierr)
7574
{
7675
MPI_Comm c_comm;
7776
MPI_Datatype c_sendtype, c_recvtype;
@@ -94,13 +93,13 @@ void ompix_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendt
9493
sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
9594
recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
9695

97-
ierr_c = PMPIX_Allgatherv_init(sendbuf,
98-
OMPI_FINT_2_INT(*sendcount),
99-
c_sendtype,
100-
recvbuf,
101-
OMPI_ARRAY_NAME_CONVERT(recvcounts),
102-
OMPI_ARRAY_NAME_CONVERT(displs),
103-
c_recvtype, c_comm, c_info, &c_request);
96+
ierr_c = PMPI_Allgatherv_init(sendbuf,
97+
OMPI_FINT_2_INT(*sendcount),
98+
c_sendtype,
99+
recvbuf,
100+
OMPI_ARRAY_NAME_CONVERT(recvcounts),
101+
OMPI_ARRAY_NAME_CONVERT(displs),
102+
c_recvtype, c_comm, c_info, &c_request);
104103

105104
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(ierr_c);
106105
if (MPI_SUCCESS == ierr_c) *request = PMPI_Request_c2f(c_request);

0 commit comments

Comments
 (0)