Skip to content

Commit 7a9321e

Browse files
ggouaillardethppritcha
ggouaillardet
authored and
hppritcha
committed
fortran/use-mpi-f08: add CFI support for (blocking) collective subroutines
Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent f050429 commit 7a9321e

Some content is hidden

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

50 files changed

+2214
-245
lines changed

‎ompi/mpi/fortran/use-mpi-f08/allgather_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ subroutine MPI_Allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvty
1515
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1616
use :: ompi_mpifh_bindings, only : ompi_allgather_f
1717
implicit none
18-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
18+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2020
INTEGER, INTENT(IN) :: sendcount, recvcount
2121
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2222
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

‎ompi/mpi/fortran/use-mpi-f08/allgatherv_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ subroutine MPI_Allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1717
use :: ompi_mpifh_bindings, only : ompi_allgatherv_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
19+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2121
INTEGER, INTENT(IN) :: sendcount
2222
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
2323
TYPE(MPI_Datatype), INTENT(IN) :: sendtype

‎ompi/mpi/fortran/use-mpi-f08/allreduce_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ subroutine MPI_Allreduce_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
1515
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
1616
use :: ompi_mpifh_bindings, only : ompi_allreduce_f
1717
implicit none
18-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
18+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2020
INTEGER, INTENT(IN) :: count
2121
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2222
TYPE(MPI_Op), INTENT(IN) :: op

‎ompi/mpi/fortran/use-mpi-f08/alltoall_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ subroutine MPI_Alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,&
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1717
use :: ompi_mpifh_bindings, only : ompi_alltoall_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
19+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2121
INTEGER, INTENT(IN) :: sendcount, recvcount
2222
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2323
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

‎ompi/mpi/fortran/use-mpi-f08/alltoallv_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ subroutine MPI_Alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1717
use :: ompi_mpifh_bindings, only : ompi_alltoallv_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
19+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2121
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
2222
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2323
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

‎ompi/mpi/fortran/use-mpi-f08/alltoallw_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ subroutine MPI_Alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,&
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1717
use :: ompi_mpifh_bindings, only : ompi_alltoallw_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
19+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
20+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2121
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
2222
TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
2323
TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)

‎ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subroutine MPI_Bcast_f08(buffer,count,datatype,root,comm,ierror)
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
1717
use :: ompi_mpifh_bindings, only : ompi_bcast_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer
19+
OMPI_F08_IGNORE_TKR_TYPE :: buffer
2020
INTEGER, INTENT(IN) :: count, root
2121
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2222
TYPE(MPI_Comm), INTENT(IN) :: comm

‎ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h.in‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -885,10 +885,10 @@ end subroutine ompi_unpack_external_f
885885

886886
subroutine ompi_allgather_f(sendbuf,sendcount,sendtype,recvbuf, &
887887
recvcount,recvtype,comm,ierror) &
888-
BIND(C, name="ompi_allgather_f")
888+
BIND(C, name="ompi_allgather_@OMPI_F08_BINDINGS_EXTENSION@")
889889
implicit none
890-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
891-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
890+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
891+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
892892
INTEGER, INTENT(IN) :: sendcount, recvcount
893893
INTEGER, INTENT(IN) :: sendtype
894894
INTEGER, INTENT(IN) :: recvtype
@@ -927,10 +927,10 @@ end subroutine ompi_allgather_init_f
927927

928928
subroutine ompi_allgatherv_f(sendbuf,sendcount,sendtype,recvbuf, &
929929
recvcounts,displs,recvtype,comm,ierror) &
930-
BIND(C, name="ompi_allgatherv_f")
930+
BIND(C, name="ompi_allgatherv_@OMPI_F08_BINDINGS_EXTENSION@")
931931
implicit none
932-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
933-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
932+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
933+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
934934
INTEGER, INTENT(IN) :: sendcount
935935
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
936936
INTEGER, INTENT(IN) :: sendtype
@@ -971,10 +971,10 @@ subroutine ompi_allgatherv_init_f(sendbuf,sendcount,sendtype,recvbuf, &
971971
end subroutine ompi_allgatherv_init_f
972972

973973
subroutine ompi_allreduce_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
974-
BIND(C, name="ompi_allreduce_f")
974+
BIND(C, name="ompi_allreduce_@OMPI_F08_BINDINGS_EXTENSION@")
975975
implicit none
976-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
977-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
976+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
977+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
978978
INTEGER, INTENT(IN) :: count
979979
INTEGER, INTENT(IN) :: datatype
980980
INTEGER, INTENT(IN) :: op
@@ -1011,10 +1011,10 @@ end subroutine ompi_allreduce_init_f
10111011

10121012
subroutine ompi_alltoall_f(sendbuf,sendcount,sendtype,recvbuf, &
10131013
recvcount,recvtype,comm,ierror) &
1014-
BIND(C, name="ompi_alltoall_f")
1014+
BIND(C, name="ompi_alltoall_@OMPI_F08_BINDINGS_EXTENSION@")
10151015
implicit none
1016-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1017-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1016+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1017+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
10181018
INTEGER, INTENT(IN) :: sendcount, recvcount
10191019
INTEGER, INTENT(IN) :: sendtype
10201020
INTEGER, INTENT(IN) :: recvtype
@@ -1053,10 +1053,10 @@ end subroutine ompi_alltoall_init_f
10531053

10541054
subroutine ompi_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype, &
10551055
recvbuf,recvcounts,rdispls,recvtype,comm,ierror) &
1056-
BIND(C, name="ompi_alltoallv_f")
1056+
BIND(C, name="ompi_alltoallv_@OMPI_F08_BINDINGS_EXTENSION@")
10571057
implicit none
1058-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1059-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1058+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1059+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
10601060
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
10611061
INTEGER, INTENT(IN) :: sendtype
10621062
INTEGER, INTENT(IN) :: recvtype
@@ -1095,10 +1095,10 @@ end subroutine ompi_alltoallv_init_f
10951095

10961096
subroutine ompi_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes, &
10971097
recvbuf,recvcounts,rdispls,recvtypes,comm,ierror) &
1098-
BIND(C, name="ompi_alltoallw_f")
1098+
BIND(C, name="ompi_alltoallw_@OMPI_F08_BINDINGS_EXTENSION@")
10991099
implicit none
1100-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1101-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1100+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1101+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
11021102
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
11031103
INTEGER, INTENT(IN) :: sendtypes
11041104
INTEGER, INTENT(IN) :: recvtypes
@@ -1160,9 +1160,9 @@ subroutine ompi_barrier_init_f(comm,info,request,ierror) &
11601160
end subroutine ompi_barrier_init_f
11611161

11621162
subroutine ompi_bcast_f(buffer,count,datatype,root,comm,ierror) &
1163-
BIND(C, name="ompi_bcast_f")
1163+
BIND(C, name="ompi_bcast_@OMPI_F08_BINDINGS_EXTENSION@")
11641164
implicit none
1165-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer
1165+
OMPI_F08_IGNORE_TKR_TYPE :: buffer
11661166
INTEGER, INTENT(IN) :: count, root
11671167
INTEGER, INTENT(IN) :: datatype
11681168
INTEGER, INTENT(IN) :: comm
@@ -1193,10 +1193,10 @@ subroutine ompi_bcast_init_f(buffer,count,datatype,root,comm,info,request,ierror
11931193
end subroutine ompi_bcast_init_f
11941194

11951195
subroutine ompi_exscan_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
1196-
BIND(C, name="ompi_exscan_f")
1196+
BIND(C, name="ompi_exscan_@OMPI_F08_BINDINGS_EXTENSION@")
11971197
implicit none
1198-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1199-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1198+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1199+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
12001200
INTEGER, INTENT(IN) :: count
12011201
INTEGER, INTENT(IN) :: datatype
12021202
INTEGER, INTENT(IN) :: op
@@ -1233,10 +1233,10 @@ end subroutine ompi_exscan_init_f
12331233

12341234
subroutine ompi_gather_f(sendbuf,sendcount,sendtype,recvbuf, &
12351235
recvcount,recvtype,root,comm,ierror) &
1236-
BIND(C, name="ompi_gather_f")
1236+
BIND(C, name="ompi_gather_@OMPI_F08_BINDINGS_EXTENSION@")
12371237
implicit none
1238-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1239-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1238+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1239+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
12401240
INTEGER, INTENT(IN) :: sendcount, recvcount, root
12411241
INTEGER, INTENT(IN) :: sendtype
12421242
INTEGER, INTENT(IN) :: recvtype
@@ -1275,10 +1275,10 @@ end subroutine ompi_gather_init_f
12751275

12761276
subroutine ompi_gatherv_f(sendbuf,sendcount,sendtype,recvbuf, &
12771277
recvcounts,displs,recvtype,root,comm,ierror) &
1278-
BIND(C, name="ompi_gatherv_f")
1278+
BIND(C, name="ompi_gatherv_@OMPI_F08_BINDINGS_EXTENSION@")
12791279
implicit none
1280-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1281-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1280+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1281+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
12821282
INTEGER, INTENT(IN) :: sendcount, root
12831283
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
12841284
INTEGER, INTENT(IN) :: sendtype
@@ -1326,10 +1326,10 @@ subroutine ompi_op_free_f(op,ierror) &
13261326
end subroutine ompi_op_free_f
13271327

13281328
subroutine ompi_reduce_f(sendbuf,recvbuf,count,datatype,op,root,comm,ierror) &
1329-
BIND(C, name="ompi_reduce_f")
1329+
BIND(C, name="ompi_reduce_@OMPI_F08_BINDINGS_EXTENSION@")
13301330
implicit none
1331-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1332-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1331+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1332+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
13331333
INTEGER, INTENT(IN) :: count, root
13341334
INTEGER, INTENT(IN) :: datatype
13351335
INTEGER, INTENT(IN) :: op
@@ -1365,10 +1365,10 @@ subroutine ompi_reduce_init_f(sendbuf,recvbuf,count,datatype,op,root,comm,info,r
13651365
end subroutine ompi_reduce_init_f
13661366

13671367
subroutine ompi_reduce_local_f(inbuf,inoutbuf,count,datatype,op,ierror) &
1368-
BIND(C, name="ompi_reduce_local_f")
1368+
BIND(C, name="ompi_reduce_local_@OMPI_F08_BINDINGS_EXTENSION@")
13691369
implicit none
1370-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
1371-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: inoutbuf
1370+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
1371+
OMPI_F08_IGNORE_TKR_TYPE :: inoutbuf
13721372
INTEGER, INTENT(IN) :: count
13731373
INTEGER, INTENT(IN) :: datatype
13741374
INTEGER, INTENT(IN) :: op
@@ -1377,10 +1377,10 @@ end subroutine ompi_reduce_local_f
13771377

13781378
subroutine ompi_reduce_scatter_f(sendbuf,recvbuf,recvcounts, &
13791379
datatype,op,comm,ierror) &
1380-
BIND(C, name="ompi_reduce_scatter_f")
1380+
BIND(C, name="ompi_reduce_scatter_@OMPI_F08_BINDINGS_EXTENSION@")
13811381
implicit none
1382-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1383-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1382+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1383+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
13841384
INTEGER, INTENT(IN) :: recvcounts(*)
13851385
INTEGER, INTENT(IN) :: datatype
13861386
INTEGER, INTENT(IN) :: op
@@ -1419,10 +1419,10 @@ end subroutine ompi_reduce_scatter_init_f
14191419

14201420
subroutine ompi_reduce_scatter_block_f(sendbuf,recvbuf,recvcount, &
14211421
datatype,op,comm,ierror) &
1422-
BIND(C, name="ompi_reduce_scatter_block_f")
1422+
BIND(C, name="ompi_reduce_scatter_block_@OMPI_F08_BINDINGS_EXTENSION@")
14231423
implicit none
1424-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1425-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1424+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1425+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
14261426
INTEGER, INTENT(IN) :: recvcount
14271427
INTEGER, INTENT(IN) :: datatype
14281428
INTEGER, INTENT(IN) :: op
@@ -1460,10 +1460,10 @@ subroutine ompi_reduce_scatter_block_init_f(sendbuf,recvbuf,recvcount, &
14601460
end subroutine ompi_reduce_scatter_block_init_f
14611461

14621462
subroutine ompi_scan_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
1463-
BIND(C, name="ompi_scan_f")
1463+
BIND(C, name="ompi_scan_@OMPI_F08_BINDINGS_EXTENSION@")
14641464
implicit none
1465-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1466-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1465+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1466+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
14671467
INTEGER, INTENT(IN) :: count
14681468
INTEGER, INTENT(IN) :: datatype
14691469
INTEGER, INTENT(IN) :: op
@@ -1500,10 +1500,10 @@ end subroutine ompi_scan_init_f
15001500

15011501
subroutine ompi_scatter_f(sendbuf,sendcount,sendtype,recvbuf, &
15021502
recvcount,recvtype,root,comm,ierror) &
1503-
BIND(C, name="ompi_scatter_f")
1503+
BIND(C, name="ompi_scatter_@OMPI_F08_BINDINGS_EXTENSION@")
15041504
implicit none
1505-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1506-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1505+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1506+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
15071507
INTEGER, INTENT(IN) :: sendcount, recvcount, root
15081508
INTEGER, INTENT(IN) :: sendtype
15091509
INTEGER, INTENT(IN) :: recvtype
@@ -1542,10 +1542,10 @@ end subroutine ompi_scatter_init_f
15421542

15431543
subroutine ompi_scatterv_f(sendbuf,sendcounts,displs,sendtype, &
15441544
recvbuf,recvcount,recvtype,root,comm,ierror) &
1545-
BIND(C, name="ompi_scatterv_f")
1545+
BIND(C, name="ompi_scatterv_@OMPI_F08_BINDINGS_EXTENSION@")
15461546
implicit none
1547-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1548-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1547+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1548+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
15491549
INTEGER, INTENT(IN) :: recvcount, root
15501550
INTEGER, INTENT(IN) :: sendcounts(*), displs(*)
15511551
INTEGER, INTENT(IN) :: sendtype
@@ -3781,11 +3781,11 @@ end subroutine ompi_mrecv_f
37813781

37823782
subroutine ompi_neighbor_allgather_f(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype, &
37833783
comm,ierror) &
3784-
BIND(C, name="ompi_neighbor_allgather_f")
3784+
BIND(C, name="ompi_neighbor_allgather_@OMPI_F08_BINDINGS_EXTENSION@")
37853785
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
37863786
implicit none
3787-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3788-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3787+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3788+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
37893789
INTEGER, INTENT(IN) :: sendcount, recvcount
37903790
INTEGER, INTENT(IN) :: sendtype, recvtype
37913791
INTEGER, INTENT(IN) :: comm
@@ -3823,11 +3823,11 @@ end subroutine ompi_neighbor_allgather_init_f
38233823

38243824
subroutine ompi_neighbor_allgatherv_f(sendbuf,sendcount,sendtype,recvbuf,recvcounts,displs, &
38253825
recvtype,comm,ierror) &
3826-
BIND(C, name="ompi_neighbor_allgatherv_f")
3826+
BIND(C, name="ompi_neighbor_allgatherv_@OMPI_F08_BINDINGS_EXTENSION@")
38273827
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
38283828
implicit none
3829-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3830-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3829+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3830+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
38313831
INTEGER, INTENT(IN) :: sendcount
38323832
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
38333833
INTEGER, INTENT(IN) :: sendtype, recvtype
@@ -3868,11 +3868,11 @@ end subroutine ompi_neighbor_allgatherv_init_f
38683868

38693869
subroutine ompi_neighbor_alltoall_f(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype, &
38703870
comm,ierror) &
3871-
BIND(C, name="ompi_neighbor_alltoall_f")
3871+
BIND(C, name="ompi_neighbor_alltoall_@OMPI_F08_BINDINGS_EXTENSION@")
38723872
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
38733873
implicit none
3874-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3875-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3874+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3875+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
38763876
INTEGER, INTENT(IN) :: sendcount, recvcount
38773877
INTEGER, INTENT(IN) :: sendtype, recvtype
38783878
INTEGER, INTENT(IN) :: comm
@@ -3910,11 +3910,11 @@ end subroutine ompi_neighbor_alltoall_init_f
39103910

39113911
subroutine ompi_neighbor_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype,recvbuf,recvcounts, &
39123912
rdispls,recvtype,comm,ierror) &
3913-
BIND(C, name="ompi_neighbor_alltoallv_f")
3913+
BIND(C, name="ompi_neighbor_alltoallv_@OMPI_F08_BINDINGS_EXTENSION@")
39143914
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
39153915
implicit none
3916-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3917-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3916+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3917+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
39183918
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
39193919
INTEGER, INTENT(IN) :: sendtype, recvtype
39203920
INTEGER, INTENT(IN) :: comm
@@ -3952,11 +3952,11 @@ end subroutine ompi_neighbor_alltoallv_init_f
39523952

39533953
subroutine ompi_neighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes,recvbuf,recvcounts, &
39543954
rdispls,recvtypes,comm,ierror) &
3955-
BIND(C, name="ompi_neighbor_alltoallw_f")
3955+
BIND(C, name="ompi_neighbor_alltoallw_@OMPI_F08_BINDINGS_EXTENSION@")
39563956
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_ADDRESS_KIND
39573957
implicit none
3958-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3959-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3958+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3959+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
39603960
INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
39613961
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
39623962
INTEGER, INTENT(IN) :: sendtypes, recvtypes

‎ompi/mpi/fortran/use-mpi-f08/exscan_f08.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ subroutine MPI_Exscan_f08(sendbuf,recvbuf,count,datatype,op,comm,ierror)
1515
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm
1616
use :: ompi_mpifh_bindings, only : ompi_exscan_f
1717
implicit none
18-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
18+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
19+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
2020
INTEGER, INTENT(IN) :: count
2121
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2222
TYPE(MPI_Op), INTENT(IN) :: op

0 commit comments

Comments
 (0)