Skip to content

Commit e991c47

Browse files
ggouaillardetggouaillardet
committed
Persistent Collectives rename: use-mpi-f08 bindings
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent c53a3c4 commit e991c47

Some content is hidden

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

56 files changed

+945
-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
@@ -118,14 +118,22 @@ mpi_api_files = \
118118
aint_add_f08.F90 \
119119
aint_diff_f08.F90 \
120120
allgather_f08.F90 \
121+
allgather_init_f08.F90 \
121122
allgatherv_f08.F90 \
123+
allgatherv_init_f08.F90 \
122124
alloc_mem_f08.F90 \
123125
allreduce_f08.F90 \
126+
allreduce_init_f08.F90 \
124127
alltoall_f08.F90 \
128+
alltoall_init_f08.F90 \
125129
alltoallv_f08.F90 \
130+
alltoallv_init_f08.F90 \
126131
alltoallw_f08.F90 \
132+
alltoallw_init_f08.F90 \
127133
barrier_f08.F90 \
134+
barrier_init_f08.F90 \
128135
bcast_f08.F90 \
136+
bcast_init_f08.F90 \
129137
bsend_f08.F90 \
130138
bsend_init_f08.F90 \
131139
buffer_attach_f08.F90 \
@@ -185,6 +193,7 @@ mpi_api_files = \
185193
error_class_f08.F90 \
186194
error_string_f08.F90 \
187195
exscan_f08.F90 \
196+
exscan_init_f08.F90 \
188197
f_sync_reg_f08.F90 \
189198
fetch_and_op_f08.F90 \
190199
file_call_errhandler_f08.F90 \
@@ -250,7 +259,9 @@ mpi_api_files = \
250259
finalize_f08.F90 \
251260
free_mem_f08.F90 \
252261
gather_f08.F90 \
262+
gather_init_f08.F90 \
253263
gatherv_f08.F90 \
264+
gatherv_init_f08.F90 \
254265
get_accumulate_f08.F90 \
255266
get_address_f08.F90 \
256267
get_count_f08.F90 \
@@ -329,10 +340,15 @@ mpi_api_files = \
329340
mprobe_f08.F90 \
330341
mrecv_f08.F90 \
331342
neighbor_allgather_f08.F90 \
343+
neighbor_allgather_init_f08.F90 \
332344
neighbor_allgatherv_f08.F90 \
345+
neighbor_allgatherv_init_f08.F90 \
333346
neighbor_alltoall_f08.F90 \
347+
neighbor_alltoall_init_f08.F90 \
334348
neighbor_alltoallv_f08.F90 \
349+
neighbor_alltoallv_init_f08.F90 \
335350
neighbor_alltoallw_f08.F90 \
351+
neighbor_alltoallw_init_f08.F90 \
336352
op_commutative_f08.F90 \
337353
op_create_f08.F90 \
338354
open_port_f08.F90 \
@@ -356,9 +372,12 @@ mpi_api_files = \
356372
recv_f08.F90 \
357373
recv_init_f08.F90 \
358374
reduce_f08.F90 \
375+
reduce_init_f08.F90 \
359376
reduce_local_f08.F90 \
360377
reduce_scatter_f08.F90 \
378+
reduce_scatter_init_f08.F90 \
361379
reduce_scatter_block_f08.F90 \
380+
reduce_scatter_block_init_f08.F90 \
362381
register_datarep_f08.F90 \
363382
request_free_f08.F90 \
364383
request_get_status_f08.F90 \
@@ -368,8 +387,11 @@ mpi_api_files = \
368387
rsend_f08.F90 \
369388
rsend_init_f08.F90 \
370389
scan_f08.F90 \
390+
scan_init_f08.F90 \
371391
scatter_f08.F90 \
392+
scatter_init_f08.F90 \
372393
scatterv_f08.F90 \
394+
scatterv_init_f08.F90 \
373395
send_f08.F90 \
374396
send_init_f08.F90 \
375397
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)