Skip to content

Commit 25870c4

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 842b95f commit 25870c4

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
@@ -881,10 +881,10 @@ end subroutine ompi_unpack_external_f
881881

882882
subroutine ompi_allgather_f(sendbuf,sendcount,sendtype,recvbuf, &
883883
recvcount,recvtype,comm,ierror) &
884-
BIND(C, name="ompi_allgather_f")
884+
BIND(C, name="ompi_allgather_@OMPI_F08_BINDINGS_EXTENSION@")
885885
implicit none
886-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
887-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
886+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
887+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
888888
INTEGER, INTENT(IN) :: sendcount, recvcount
889889
INTEGER, INTENT(IN) :: sendtype
890890
INTEGER, INTENT(IN) :: recvtype
@@ -923,10 +923,10 @@ end subroutine ompi_allgather_init_f
923923

924924
subroutine ompi_allgatherv_f(sendbuf,sendcount,sendtype,recvbuf, &
925925
recvcounts,displs,recvtype,comm,ierror) &
926-
BIND(C, name="ompi_allgatherv_f")
926+
BIND(C, name="ompi_allgatherv_@OMPI_F08_BINDINGS_EXTENSION@")
927927
implicit none
928-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
929-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
928+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
929+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
930930
INTEGER, INTENT(IN) :: sendcount
931931
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
932932
INTEGER, INTENT(IN) :: sendtype
@@ -967,10 +967,10 @@ subroutine ompi_allgatherv_init_f(sendbuf,sendcount,sendtype,recvbuf, &
967967
end subroutine ompi_allgatherv_init_f
968968

969969
subroutine ompi_allreduce_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
970-
BIND(C, name="ompi_allreduce_f")
970+
BIND(C, name="ompi_allreduce_@OMPI_F08_BINDINGS_EXTENSION@")
971971
implicit none
972-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
973-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
972+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
973+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
974974
INTEGER, INTENT(IN) :: count
975975
INTEGER, INTENT(IN) :: datatype
976976
INTEGER, INTENT(IN) :: op
@@ -1007,10 +1007,10 @@ end subroutine ompi_allreduce_init_f
10071007

10081008
subroutine ompi_alltoall_f(sendbuf,sendcount,sendtype,recvbuf, &
10091009
recvcount,recvtype,comm,ierror) &
1010-
BIND(C, name="ompi_alltoall_f")
1010+
BIND(C, name="ompi_alltoall_@OMPI_F08_BINDINGS_EXTENSION@")
10111011
implicit none
1012-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1013-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1012+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1013+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
10141014
INTEGER, INTENT(IN) :: sendcount, recvcount
10151015
INTEGER, INTENT(IN) :: sendtype
10161016
INTEGER, INTENT(IN) :: recvtype
@@ -1049,10 +1049,10 @@ end subroutine ompi_alltoall_init_f
10491049

10501050
subroutine ompi_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype, &
10511051
recvbuf,recvcounts,rdispls,recvtype,comm,ierror) &
1052-
BIND(C, name="ompi_alltoallv_f")
1052+
BIND(C, name="ompi_alltoallv_@OMPI_F08_BINDINGS_EXTENSION@")
10531053
implicit none
1054-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1055-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1054+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1055+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
10561056
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
10571057
INTEGER, INTENT(IN) :: sendtype
10581058
INTEGER, INTENT(IN) :: recvtype
@@ -1091,10 +1091,10 @@ end subroutine ompi_alltoallv_init_f
10911091

10921092
subroutine ompi_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes, &
10931093
recvbuf,recvcounts,rdispls,recvtypes,comm,ierror) &
1094-
BIND(C, name="ompi_alltoallw_f")
1094+
BIND(C, name="ompi_alltoallw_@OMPI_F08_BINDINGS_EXTENSION@")
10951095
implicit none
1096-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1097-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1096+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1097+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
10981098
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
10991099
INTEGER, INTENT(IN) :: sendtypes
11001100
INTEGER, INTENT(IN) :: recvtypes
@@ -1156,9 +1156,9 @@ subroutine ompi_barrier_init_f(comm,info,request,ierror) &
11561156
end subroutine ompi_barrier_init_f
11571157

11581158
subroutine ompi_bcast_f(buffer,count,datatype,root,comm,ierror) &
1159-
BIND(C, name="ompi_bcast_f")
1159+
BIND(C, name="ompi_bcast_@OMPI_F08_BINDINGS_EXTENSION@")
11601160
implicit none
1161-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer
1161+
OMPI_F08_IGNORE_TKR_TYPE :: buffer
11621162
INTEGER, INTENT(IN) :: count, root
11631163
INTEGER, INTENT(IN) :: datatype
11641164
INTEGER, INTENT(IN) :: comm
@@ -1189,10 +1189,10 @@ subroutine ompi_bcast_init_f(buffer,count,datatype,root,comm,info,request,ierror
11891189
end subroutine ompi_bcast_init_f
11901190

11911191
subroutine ompi_exscan_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
1192-
BIND(C, name="ompi_exscan_f")
1192+
BIND(C, name="ompi_exscan_@OMPI_F08_BINDINGS_EXTENSION@")
11931193
implicit none
1194-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1195-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1194+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1195+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
11961196
INTEGER, INTENT(IN) :: count
11971197
INTEGER, INTENT(IN) :: datatype
11981198
INTEGER, INTENT(IN) :: op
@@ -1229,10 +1229,10 @@ end subroutine ompi_exscan_init_f
12291229

12301230
subroutine ompi_gather_f(sendbuf,sendcount,sendtype,recvbuf, &
12311231
recvcount,recvtype,root,comm,ierror) &
1232-
BIND(C, name="ompi_gather_f")
1232+
BIND(C, name="ompi_gather_@OMPI_F08_BINDINGS_EXTENSION@")
12331233
implicit none
1234-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1235-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1234+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1235+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
12361236
INTEGER, INTENT(IN) :: sendcount, recvcount, root
12371237
INTEGER, INTENT(IN) :: sendtype
12381238
INTEGER, INTENT(IN) :: recvtype
@@ -1271,10 +1271,10 @@ end subroutine ompi_gather_init_f
12711271

12721272
subroutine ompi_gatherv_f(sendbuf,sendcount,sendtype,recvbuf, &
12731273
recvcounts,displs,recvtype,root,comm,ierror) &
1274-
BIND(C, name="ompi_gatherv_f")
1274+
BIND(C, name="ompi_gatherv_@OMPI_F08_BINDINGS_EXTENSION@")
12751275
implicit none
1276-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1277-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1276+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1277+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
12781278
INTEGER, INTENT(IN) :: sendcount, root
12791279
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
12801280
INTEGER, INTENT(IN) :: sendtype
@@ -1322,10 +1322,10 @@ subroutine ompi_op_free_f(op,ierror) &
13221322
end subroutine ompi_op_free_f
13231323

13241324
subroutine ompi_reduce_f(sendbuf,recvbuf,count,datatype,op,root,comm,ierror) &
1325-
BIND(C, name="ompi_reduce_f")
1325+
BIND(C, name="ompi_reduce_@OMPI_F08_BINDINGS_EXTENSION@")
13261326
implicit none
1327-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1328-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1327+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1328+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
13291329
INTEGER, INTENT(IN) :: count, root
13301330
INTEGER, INTENT(IN) :: datatype
13311331
INTEGER, INTENT(IN) :: op
@@ -1361,10 +1361,10 @@ subroutine ompi_reduce_init_f(sendbuf,recvbuf,count,datatype,op,root,comm,info,r
13611361
end subroutine ompi_reduce_init_f
13621362

13631363
subroutine ompi_reduce_local_f(inbuf,inoutbuf,count,datatype,op,ierror) &
1364-
BIND(C, name="ompi_reduce_local_f")
1364+
BIND(C, name="ompi_reduce_local_@OMPI_F08_BINDINGS_EXTENSION@")
13651365
implicit none
1366-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
1367-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: inoutbuf
1366+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf
1367+
OMPI_F08_IGNORE_TKR_TYPE :: inoutbuf
13681368
INTEGER, INTENT(IN) :: count
13691369
INTEGER, INTENT(IN) :: datatype
13701370
INTEGER, INTENT(IN) :: op
@@ -1373,10 +1373,10 @@ end subroutine ompi_reduce_local_f
13731373

13741374
subroutine ompi_reduce_scatter_f(sendbuf,recvbuf,recvcounts, &
13751375
datatype,op,comm,ierror) &
1376-
BIND(C, name="ompi_reduce_scatter_f")
1376+
BIND(C, name="ompi_reduce_scatter_@OMPI_F08_BINDINGS_EXTENSION@")
13771377
implicit none
1378-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1379-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1378+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1379+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
13801380
INTEGER, INTENT(IN) :: recvcounts(*)
13811381
INTEGER, INTENT(IN) :: datatype
13821382
INTEGER, INTENT(IN) :: op
@@ -1415,10 +1415,10 @@ end subroutine ompi_reduce_scatter_init_f
14151415

14161416
subroutine ompi_reduce_scatter_block_f(sendbuf,recvbuf,recvcount, &
14171417
datatype,op,comm,ierror) &
1418-
BIND(C, name="ompi_reduce_scatter_block_f")
1418+
BIND(C, name="ompi_reduce_scatter_block_@OMPI_F08_BINDINGS_EXTENSION@")
14191419
implicit none
1420-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1421-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1420+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1421+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
14221422
INTEGER, INTENT(IN) :: recvcount
14231423
INTEGER, INTENT(IN) :: datatype
14241424
INTEGER, INTENT(IN) :: op
@@ -1456,10 +1456,10 @@ subroutine ompi_reduce_scatter_block_init_f(sendbuf,recvbuf,recvcount, &
14561456
end subroutine ompi_reduce_scatter_block_init_f
14571457

14581458
subroutine ompi_scan_f(sendbuf,recvbuf,count,datatype,op,comm,ierror) &
1459-
BIND(C, name="ompi_scan_f")
1459+
BIND(C, name="ompi_scan_@OMPI_F08_BINDINGS_EXTENSION@")
14601460
implicit none
1461-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1462-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1461+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1462+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
14631463
INTEGER, INTENT(IN) :: count
14641464
INTEGER, INTENT(IN) :: datatype
14651465
INTEGER, INTENT(IN) :: op
@@ -1496,10 +1496,10 @@ end subroutine ompi_scan_init_f
14961496

14971497
subroutine ompi_scatter_f(sendbuf,sendcount,sendtype,recvbuf, &
14981498
recvcount,recvtype,root,comm,ierror) &
1499-
BIND(C, name="ompi_scatter_f")
1499+
BIND(C, name="ompi_scatter_@OMPI_F08_BINDINGS_EXTENSION@")
15001500
implicit none
1501-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1502-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1501+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1502+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
15031503
INTEGER, INTENT(IN) :: sendcount, recvcount, root
15041504
INTEGER, INTENT(IN) :: sendtype
15051505
INTEGER, INTENT(IN) :: recvtype
@@ -1538,10 +1538,10 @@ end subroutine ompi_scatter_init_f
15381538

15391539
subroutine ompi_scatterv_f(sendbuf,sendcounts,displs,sendtype, &
15401540
recvbuf,recvcount,recvtype,root,comm,ierror) &
1541-
BIND(C, name="ompi_scatterv_f")
1541+
BIND(C, name="ompi_scatterv_@OMPI_F08_BINDINGS_EXTENSION@")
15421542
implicit none
1543-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1544-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
1543+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
1544+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
15451545
INTEGER, INTENT(IN) :: recvcount, root
15461546
INTEGER, INTENT(IN) :: sendcounts(*), displs(*)
15471547
INTEGER, INTENT(IN) :: sendtype
@@ -3770,11 +3770,11 @@ end subroutine ompi_mrecv_f
37703770

37713771
subroutine ompi_neighbor_allgather_f(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype, &
37723772
comm,ierror) &
3773-
BIND(C, name="ompi_neighbor_allgather_f")
3773+
BIND(C, name="ompi_neighbor_allgather_@OMPI_F08_BINDINGS_EXTENSION@")
37743774
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
37753775
implicit none
3776-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3777-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3776+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3777+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
37783778
INTEGER, INTENT(IN) :: sendcount, recvcount
37793779
INTEGER, INTENT(IN) :: sendtype, recvtype
37803780
INTEGER, INTENT(IN) :: comm
@@ -3812,11 +3812,11 @@ end subroutine ompi_neighbor_allgather_init_f
38123812

38133813
subroutine ompi_neighbor_allgatherv_f(sendbuf,sendcount,sendtype,recvbuf,recvcounts,displs, &
38143814
recvtype,comm,ierror) &
3815-
BIND(C, name="ompi_neighbor_allgatherv_f")
3815+
BIND(C, name="ompi_neighbor_allgatherv_@OMPI_F08_BINDINGS_EXTENSION@")
38163816
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
38173817
implicit none
3818-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3819-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3818+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3819+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
38203820
INTEGER, INTENT(IN) :: sendcount
38213821
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
38223822
INTEGER, INTENT(IN) :: sendtype, recvtype
@@ -3857,11 +3857,11 @@ end subroutine ompi_neighbor_allgatherv_init_f
38573857

38583858
subroutine ompi_neighbor_alltoall_f(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvtype, &
38593859
comm,ierror) &
3860-
BIND(C, name="ompi_neighbor_alltoall_f")
3860+
BIND(C, name="ompi_neighbor_alltoall_@OMPI_F08_BINDINGS_EXTENSION@")
38613861
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
38623862
implicit none
3863-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3864-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3863+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3864+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
38653865
INTEGER, INTENT(IN) :: sendcount, recvcount
38663866
INTEGER, INTENT(IN) :: sendtype, recvtype
38673867
INTEGER, INTENT(IN) :: comm
@@ -3899,11 +3899,11 @@ end subroutine ompi_neighbor_alltoall_init_f
38993899

39003900
subroutine ompi_neighbor_alltoallv_f(sendbuf,sendcounts,sdispls,sendtype,recvbuf,recvcounts, &
39013901
rdispls,recvtype,comm,ierror) &
3902-
BIND(C, name="ompi_neighbor_alltoallv_f")
3902+
BIND(C, name="ompi_neighbor_alltoallv_@OMPI_F08_BINDINGS_EXTENSION@")
39033903
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm
39043904
implicit none
3905-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3906-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3905+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3906+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
39073907
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
39083908
INTEGER, INTENT(IN) :: sendtype, recvtype
39093909
INTEGER, INTENT(IN) :: comm
@@ -3941,11 +3941,11 @@ end subroutine ompi_neighbor_alltoallv_init_f
39413941

39423942
subroutine ompi_neighbor_alltoallw_f(sendbuf,sendcounts,sdispls,sendtypes,recvbuf,recvcounts, &
39433943
rdispls,recvtypes,comm,ierror) &
3944-
BIND(C, name="ompi_neighbor_alltoallw_f")
3944+
BIND(C, name="ompi_neighbor_alltoallw_@OMPI_F08_BINDINGS_EXTENSION@")
39453945
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_ADDRESS_KIND
39463946
implicit none
3947-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3948-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf
3947+
OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
3948+
OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
39493949
INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*)
39503950
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*)
39513951
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)