Skip to content

Commit 2547edc

Browse files
ggouaillardetawlauria
ggouaillardet
authored and
awlauria
committed
Persistent Collectives rename: use-mpi-f08 bindings
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp> (cherry picked from commit b48e2ce)
1 parent 7489ce2 commit 2547edc

Some content is hidden

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

55 files changed

+943
-2282
lines changed

‎ompi/mpi/fortran/use-mpi-f08/Makefile.am

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,22 @@ mpi_api_files = \
117117
aint_add_f08.F90 \
118118
aint_diff_f08.F90 \
119119
allgather_f08.F90 \
120+
allgather_init_f08.F90 \
120121
allgatherv_f08.F90 \
122+
allgatherv_init_f08.F90 \
121123
alloc_mem_f08.F90 \
122124
allreduce_f08.F90 \
125+
allreduce_init_f08.F90 \
123126
alltoall_f08.F90 \
127+
alltoall_init_f08.F90 \
124128
alltoallv_f08.F90 \
129+
alltoallv_init_f08.F90 \
125130
alltoallw_f08.F90 \
131+
alltoallw_init_f08.F90 \
126132
barrier_f08.F90 \
133+
barrier_init_f08.F90 \
127134
bcast_f08.F90 \
135+
bcast_init_f08.F90 \
128136
bsend_f08.F90 \
129137
bsend_init_f08.F90 \
130138
buffer_attach_f08.F90 \
@@ -184,6 +192,7 @@ mpi_api_files = \
184192
error_class_f08.F90 \
185193
error_string_f08.F90 \
186194
exscan_f08.F90 \
195+
exscan_init_f08.F90 \
187196
f_sync_reg_f08.F90 \
188197
fetch_and_op_f08.F90 \
189198
file_call_errhandler_f08.F90 \
@@ -249,7 +258,9 @@ mpi_api_files = \
249258
finalize_f08.F90 \
250259
free_mem_f08.F90 \
251260
gather_f08.F90 \
261+
gather_init_f08.F90 \
252262
gatherv_f08.F90 \
263+
gatherv_init_f08.F90 \
253264
get_accumulate_f08.F90 \
254265
get_address_f08.F90 \
255266
get_count_f08.F90 \
@@ -328,10 +339,15 @@ mpi_api_files = \
328339
mprobe_f08.F90 \
329340
mrecv_f08.F90 \
330341
neighbor_allgather_f08.F90 \
342+
neighbor_allgather_init_f08.F90 \
331343
neighbor_allgatherv_f08.F90 \
344+
neighbor_allgatherv_init_f08.F90 \
332345
neighbor_alltoall_f08.F90 \
346+
neighbor_alltoall_init_f08.F90 \
333347
neighbor_alltoallv_f08.F90 \
348+
neighbor_alltoallv_init_f08.F90 \
334349
neighbor_alltoallw_f08.F90 \
350+
neighbor_alltoallw_init_f08.F90 \
335351
op_commutative_f08.F90 \
336352
op_create_f08.F90 \
337353
open_port_f08.F90 \
@@ -349,9 +365,12 @@ mpi_api_files = \
349365
recv_f08.F90 \
350366
recv_init_f08.F90 \
351367
reduce_f08.F90 \
368+
reduce_init_f08.F90 \
352369
reduce_local_f08.F90 \
353370
reduce_scatter_f08.F90 \
371+
reduce_scatter_init_f08.F90 \
354372
reduce_scatter_block_f08.F90 \
373+
reduce_scatter_block_init_f08.F90 \
355374
register_datarep_f08.F90 \
356375
request_free_f08.F90 \
357376
request_get_status_f08.F90 \
@@ -361,8 +380,11 @@ mpi_api_files = \
361380
rsend_f08.F90 \
362381
rsend_init_f08.F90 \
363382
scan_f08.F90 \
383+
scan_init_f08.F90 \
364384
scatter_f08.F90 \
385+
scatter_init_f08.F90 \
365386
scatterv_f08.F90 \
387+
scatterv_init_f08.F90 \
366388
send_f08.F90 \
367389
send_init_f08.F90 \
368390
sendrecv_f08.F90 \

‎ompi/mpiext/pcollreq/use-mpi-f08/allgather_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/allgather_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Allgather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,info,request,ierror)
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Allgather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype,comm,info,request,ierror)
1416
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
15-
use :: mpiext_pcollreq_f08, only : ompix_allgather_init_f
17+
use :: ompi_mpifh_bindings, only : ompi_allgather_init_f
1618
implicit none
1719
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -25,8 +27,8 @@ subroutine MPIX_Allgather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,
2527
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2628
integer :: c_ierror
2729

28-
call ompix_allgather_init_f(sendbuf,sendcount,sendtype%MPI_VAL,&
30+
call ompi_allgather_init_f(sendbuf,sendcount,sendtype%MPI_VAL,&
2931
recvbuf,recvcount,recvtype%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
3032
if (present(ierror)) ierror = c_ierror
3133

32-
end subroutine MPIX_Allgather_init_f08
34+
end subroutine MPI_Allgather_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/allgatherv_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/allgatherv_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Allgatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Allgatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
1416
displs,recvtype,comm,info,request,ierror)
1517
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
16-
use :: mpiext_pcollreq_f08, only : ompix_allgatherv_init_f
18+
use :: ompi_mpifh_bindings, only : ompi_allgatherv_init_f
1719
implicit none
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1921
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -27,8 +29,8 @@ subroutine MPIX_Allgatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount
2729
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2830
integer :: c_ierror
2931

30-
call ompix_allgatherv_init_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
32+
call ompi_allgatherv_init_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,recvcounts,&
3133
displs,recvtype%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
3234
if (present(ierror)) ierror = c_ierror
3335

34-
end subroutine MPIX_Allgatherv_init_f08
36+
end subroutine MPI_Allgatherv_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/allreduce_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/allreduce_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Allreduce_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,request,ierror)
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Allreduce_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,request,ierror)
1416
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Info, MPI_Request
15-
use :: mpiext_pcollreq_f08, only : ompix_allreduce_init_f
17+
use :: ompi_mpifh_bindings, only : ompi_allreduce_init_f
1618
implicit none
1719
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -25,8 +27,8 @@ subroutine MPIX_Allreduce_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,r
2527
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2628
integer :: c_ierror
2729

28-
call ompix_allreduce_init_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
30+
call ompi_allreduce_init_f(sendbuf,recvbuf,count,datatype%MPI_VAL,&
2931
op%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
3032
if (present(ierror)) ierror = c_ierror
3133

32-
end subroutine MPIX_Allreduce_init_f08
34+
end subroutine MPI_Allreduce_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/alltoall_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/alltoall_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Alltoall_init_f08(sendbuf,sendcount,sendtype,recvbuf,&
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Alltoall_init_f08(sendbuf,sendcount,sendtype,recvbuf,&
1416
recvcount,recvtype,comm,info,request,ierror)
1517
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
16-
use :: mpiext_pcollreq_f08, only : ompix_alltoall_init_f
18+
use :: ompi_mpifh_bindings, only : ompi_alltoall_init_f
1719
implicit none
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1921
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -26,8 +28,8 @@ subroutine MPIX_Alltoall_init_f08(sendbuf,sendcount,sendtype,recvbuf,&
2628
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2729
integer :: c_ierror
2830

29-
call ompix_alltoall_init_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
31+
call ompi_alltoall_init_f(sendbuf,sendcount,sendtype%MPI_VAL,recvbuf,&
3032
recvcount,recvtype%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
3133
if (present(ierror)) ierror = c_ierror
3234

33-
end subroutine MPIX_Alltoall_init_f08
35+
end subroutine MPI_Alltoall_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/alltoallv_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/alltoallv_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Alltoallv_init_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Alltoallv_init_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
1416
recvcounts,rdispls,recvtype,comm,info,request,ierror)
1517
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
16-
use :: mpiext_pcollreq_f08, only : ompix_alltoallv_init_f
18+
use :: ompi_mpifh_bindings, only : ompi_alltoallv_init_f
1719
implicit none
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1921
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -26,8 +28,8 @@ subroutine MPIX_Alltoallv_init_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
2628
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2729
integer :: c_ierror
2830

29-
call ompix_alltoallv_init_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
31+
call ompi_alltoallv_init_f(sendbuf,sendcounts,sdispls,sendtype%MPI_VAL,&
3032
recvbuf,recvcounts,rdispls,recvtype%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
3133
if (present(ierror)) ierror = c_ierror
3234

33-
end subroutine MPIX_Alltoallv_init_f08
35+
end subroutine MPI_Alltoallv_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/alltoallw_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/alltoallw_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Alltoallw_init_f08(sendbuf,sendcounts,sdispls,sendtypes,&
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Alltoallw_init_f08(sendbuf,sendcounts,sdispls,sendtypes,&
1416
recvbuf,recvcounts,rdispls,recvtypes,comm,info,request,ierror)
1517
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
16-
use :: mpiext_pcollreq_f08, only : ompix_alltoallw_init_f
18+
use :: ompi_mpifh_bindings, only : ompi_alltoallw_init_f
1719
implicit none
1820
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
1921
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
@@ -35,8 +37,8 @@ subroutine MPIX_Alltoallw_init_f08(sendbuf,sendcounts,sdispls,sendtypes,&
3537
! as passing the address to an array of integers. To be clear: the
3638
! back-end ompi_alltoallw_f is expecting a pointer to an array of
3739
! integers. So it all works out (but is a hack :-\ ).
38-
call ompix_alltoallw_init_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
40+
call ompi_alltoallw_init_f(sendbuf,sendcounts,sdispls,sendtypes(1)%MPI_VAL,&
3941
recvbuf,recvcounts,rdispls,recvtypes(1)%MPI_VAL,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
4042
if (present(ierror)) ierror = c_ierror
4143

42-
end subroutine MPIX_Alltoallw_init_f08
44+
end subroutine MPI_Alltoallw_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/barrier_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/barrier_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! $COPYRIGHT$
99

10-
subroutine MPIX_Barrier_init_f08(comm,info,request,ierror)
10+
#include "mpi-f08-rename.h"
11+
12+
subroutine MPI_Barrier_init_f08(comm,info,request,ierror)
1113
use :: mpi_f08_types, only : MPI_Comm, MPI_Info, MPI_Request
12-
use :: mpiext_pcollreq_f08, only : ompix_barrier_init_f
14+
use :: ompi_mpifh_bindings, only : ompi_barrier_init_f
1315
implicit none
1416
TYPE(MPI_Comm), INTENT(IN) :: comm
1517
TYPE(MPI_Info), INTENT(IN) :: info
1618
TYPE(MPI_Request), INTENT(OUT) :: request
1719
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
1820
integer :: c_ierror
1921

20-
call ompix_barrier_init_f(comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
22+
call ompi_barrier_init_f(comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
2123
if (present(ierror)) ierror = c_ierror
2224

23-
end subroutine MPIX_Barrier_init_f08
25+
end subroutine MPI_Barrier_init_f08

‎ompi/mpiext/pcollreq/use-mpi-f08/bcast_init_f08.F90 renamed to ‎ompi/mpi/fortran/use-mpi-f08/bcast_init_f08.F90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
6-
! Copyright (c) 2018 Research Organization for Information Science
6+
! Copyright (c) 2018-2021 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
99
! $COPYRIGHT$
1010

1111
#include "ompi/mpi/fortran/configure-fortran-output.h"
1212

13-
subroutine MPIX_Bcast_init_f08(buffer,count,datatype,root,comm,info,request,ierror)
13+
#include "mpi-f08-rename.h"
14+
15+
subroutine MPI_Bcast_init_f08(buffer,count,datatype,root,comm,info,request,ierror)
1416
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
15-
use :: mpiext_pcollreq_f08, only : ompix_bcast_init_f
17+
use :: ompi_mpifh_bindings, only : ompi_bcast_init_f
1618
implicit none
1719
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: buffer
1820
INTEGER, INTENT(IN) :: count, root
@@ -23,7 +25,7 @@ subroutine MPIX_Bcast_init_f08(buffer,count,datatype,root,comm,info,request,ierr
2325
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
2426
integer :: c_ierror
2527

26-
call ompix_bcast_init_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
28+
call ompi_bcast_init_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,info%MPI_VAL,request%MPI_VAL,c_ierror)
2729
if (present(ierror)) ierror = c_ierror
2830

29-
end subroutine MPIX_Bcast_init_f08
31+
end subroutine MPI_Bcast_init_f08

0 commit comments

Comments
 (0)