Skip to content

Commit 5f1c940

Browse files
kawashima-fjkawashima-fj
authored
Merge pull request #5840 from kawashima-fj/pr/pcollreq-f08-signatures
mpiext/pcollreq: Correct f08 routine signatures
2 parents 56a55cd + be91a26 commit 5f1c940

Some content is hidden

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

43 files changed

+264
-189
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -13,7 +14,8 @@ subroutine MPIX_Allgather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,
1314
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1415
use :: mpiext_pcollreq_f08, only : ompix_allgather_init_f
1516
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1719
INTEGER, INTENT(IN) :: sendcount, recvcount
1820
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
1921
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -14,9 +15,10 @@ subroutine MPIX_Allgatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_allgatherv_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1820
INTEGER, INTENT(IN) :: sendcount
19-
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
21+
INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*), displs(*)
2022
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2123
TYPE(MPI_Datatype), INTENT(IN) :: recvtype
2224
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -13,7 +14,8 @@ subroutine MPIX_Allreduce_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,r
1314
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Info, MPI_Request
1415
use :: mpiext_pcollreq_f08, only : ompix_allreduce_init_f
1516
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1719
INTEGER, INTENT(IN) :: count
1820
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1921
TYPE(MPI_Op), INTENT(IN) :: op

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -14,7 +15,8 @@ subroutine MPIX_Alltoall_init_f08(sendbuf,sendcount,sendtype,recvbuf,&
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_alltoall_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1820
INTEGER, INTENT(IN) :: sendcount, recvcount
1921
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2022
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -14,8 +15,9 @@ subroutine MPIX_Alltoallv_init_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_alltoallv_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18-
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
20+
INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
1921
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2022
TYPE(MPI_Datatype), INTENT(IN) :: recvtype
2123
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -14,10 +15,10 @@ subroutine MPIX_Alltoallw_init_f08(sendbuf,sendcounts,sdispls,sendtypes,&
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_alltoallw_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18-
INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
19-
TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*)
20-
TYPE(MPI_Datatype), INTENT(IN) :: recvtypes(*)
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
20+
INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
21+
TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*)
2122
TYPE(MPI_Comm), INTENT(IN) :: comm
2223
TYPE(MPI_Info), INTENT(IN) :: info
2324
TYPE(MPI_Request), INTENT(OUT) :: request

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ subroutine MPIX_Bcast_init_f08(buffer,count,datatype,root,comm,info,request,ierr
1414
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1515
use :: mpiext_pcollreq_f08, only : ompix_bcast_init_f
1616
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: buffer
1818
INTEGER, INTENT(IN) :: count, root
1919
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2020
TYPE(MPI_Comm), INTENT(IN) :: comm

‎ompi/mpiext/pcollreq/use-mpi-f08/exscan_init_f08.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
@@ -13,7 +14,8 @@ subroutine MPIX_Exscan_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,requ
1314
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Info, MPI_Request
1415
use :: mpiext_pcollreq_f08, only : ompix_exscan_init_f
1516
implicit none
16-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
17+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1719
INTEGER, INTENT(IN) :: count
1820
TYPE(MPI_Datatype), INTENT(IN) :: datatype
1921
TYPE(MPI_Op), INTENT(IN) :: op

‎ompi/mpiext/pcollreq/use-mpi-f08/gather_init_f08.F90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
1112

1213
subroutine MPIX_Gather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,&
13-
recvtype,root,comm,info,request,ierror)
14+
recvtype,root,comm,info,request,ierror)
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_gather_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1820
INTEGER, INTENT(IN) :: sendcount, recvcount, root
1921
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2022
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

‎ompi/mpiext/pcollreq/use-mpi-f08/gatherv_init_f08.F90

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@
55
! All rights reserved.
66
! Copyright (c) 2018 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
8+
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
89
! $COPYRIGHT$
910

1011
#include "ompi/mpi/fortran/configure-fortran-output.h"
1112

1213
subroutine MPIX_Gatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts,&
13-
displs,recvtype,root,comm,info,request,ierror)
14+
displs,recvtype,root,comm,info,request,ierror)
1415
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1516
use :: mpiext_pcollreq_f08, only : ompix_gatherv_init_f
1617
implicit none
17-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf
18+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
1820
INTEGER, INTENT(IN) :: sendcount, root
19-
INTEGER, INTENT(IN) :: recvcounts(*), displs(*)
21+
INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*), displs(*)
2022
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2123
TYPE(MPI_Datatype), INTENT(IN) :: recvtype
2224
TYPE(MPI_Comm), INTENT(IN) :: comm

0 commit comments

Comments
 (0)