From b9316d3136732bdc5a9268fefbba819eef0d4170 Mon Sep 17 00:00:00 2001 From: KAWASHIMA Takahiro Date: Fri, 28 Sep 2018 17:17:52 +0900 Subject: [PATCH] fortran/use-mpi-f08: Correct f08 routine signatures Following the commit f750c6932c, I compared `ompi/mpi/fortran/use-mpi-f08/*.F90` and `ompi/mpi/fortran/use-mpi-f08/profile/p*.F90`, and `ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90` and `ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90`. There are many differences. Some are bugs of `MPI_*`, some are bugs of `PMPI_*`. I'm not sure how these bugs affect applications. To make it easy to compare these files future, I also removed editorial differences. Signed-off-by: KAWASHIMA Takahiro (cherry picked from commit cf6d28cb66981cf315f84e5efb8f8256b6c6a3a4) --- ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 | 9 ++--- ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 | 3 +- .../fortran/use-mpi-f08/buffer_attach_f08.F90 | 3 +- .../fortran/use-mpi-f08/buffer_detach_f08.F90 | 3 +- .../fortran/use-mpi-f08/comm_spawn_f08.F90 | 3 +- .../use-mpi-f08/comm_spawn_multiple_f08.F90 | 3 +- .../fortran/use-mpi-f08/ialltoallw_f08.F90 | 4 +-- ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 | 5 +-- ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 | 2 ++ .../use-mpi-f08/ineighbor_allgather_f08.F90 | 4 ++- .../use-mpi-f08/ineighbor_allgatherv_f08.F90 | 4 ++- .../use-mpi-f08/ineighbor_alltoall_f08.F90 | 4 ++- .../use-mpi-f08/ineighbor_alltoallv_f08.F90 | 4 ++- .../use-mpi-f08/mod/mpi-f08-interfaces.F90 | 12 +++---- .../use-mpi-f08/mod/pmpi-f08-interfaces.F90 | 33 +++++++++---------- .../use-mpi-f08/neighbor_allgather_f08.F90 | 4 ++- .../use-mpi-f08/neighbor_allgatherv_f08.F90 | 4 ++- .../use-mpi-f08/neighbor_alltoall_f08.F90 | 4 ++- .../use-mpi-f08/neighbor_alltoallv_f08.F90 | 4 ++- .../fortran/use-mpi-f08/pack_external_f08.F90 | 4 ++- ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 | 4 ++- .../use-mpi-f08/profile/paccumulate_f08.F90 | 3 +- .../use-mpi-f08/profile/paint_add_f08.F90 | 7 ++-- .../use-mpi-f08/profile/pbcast_f08.F90 | 3 +- .../profile/pbuffer_attach_f08.F90 | 3 +- .../profile/pcomm_create_keyval_f08.F90 | 2 +- .../use-mpi-f08/profile/pcomm_spawn_f08.F90 | 3 +- .../profile/pcomm_spawn_multiple_f08.F90 | 3 +- .../profile/pcompare_and_swap_f08.F90 | 5 +-- .../use-mpi-f08/profile/pfetch_and_op_f08.F90 | 5 +-- .../use-mpi-f08/profile/pfree_mem_f08.F90 | 2 +- .../profile/pget_accumulate_f08.F90 | 5 +-- .../fortran/use-mpi-f08/profile/pget_f08.F90 | 3 +- .../profile/pget_processor_name_f08.F90 | 2 +- .../use-mpi-f08/profile/pibcast_f08.F90 | 3 +- .../use-mpi-f08/profile/pimprobe_f08.F90 | 4 +-- .../profile/pineighbor_allgather_f08.F90 | 4 ++- .../profile/pineighbor_allgatherv_f08.F90 | 4 ++- .../profile/pineighbor_alltoall_f08.F90 | 4 ++- .../profile/pineighbor_alltoallv_f08.F90 | 4 ++- .../profile/pineighbor_alltoallw_f08.F90 | 4 ++- .../use-mpi-f08/profile/pinfo_get_f08.F90 | 3 +- .../use-mpi-f08/profile/piprobe_f08.F90 | 2 ++ .../profile/pneighbor_allgather_f08.F90 | 4 ++- .../profile/pneighbor_allgatherv_f08.F90 | 4 ++- .../profile/pneighbor_alltoall_f08.F90 | 4 ++- .../profile/pneighbor_alltoallv_f08.F90 | 4 ++- .../profile/pneighbor_alltoallw_f08.F90 | 4 ++- .../profile/ppack_external_f08.F90 | 4 ++- .../fortran/use-mpi-f08/profile/ppack_f08.F90 | 4 ++- .../fortran/use-mpi-f08/profile/pput_f08.F90 | 3 +- .../use-mpi-f08/profile/praccumulate_f08.F90 | 3 +- .../use-mpi-f08/profile/precv_init_f08.F90 | 3 +- .../profile/prget_accumulate_f08.F90 | 5 +-- .../fortran/use-mpi-f08/profile/prget_f08.F90 | 3 +- .../fortran/use-mpi-f08/profile/prput_f08.F90 | 3 +- .../use-mpi-f08/profile/psendrecv_f08.F90 | 4 ++- .../profile/psendrecv_replace_f08.F90 | 3 +- .../use-mpi-f08/profile/ptype_vector_f08.F90 | 3 +- .../profile/punpack_external_f08.F90 | 4 ++- .../use-mpi-f08/profile/punpack_f08.F90 | 4 ++- .../use-mpi-f08/profile/pwin_attach_f08.F90 | 3 +- .../use-mpi-f08/profile/pwin_create_f08.F90 | 3 +- .../use-mpi-f08/profile/pwin_detach_f08.F90 | 3 +- .../use-mpi-f08/profile/pwin_sync_f08.F90 | 3 +- .../fortran/use-mpi-f08/raccumulate_f08.F90 | 2 +- .../mpi/fortran/use-mpi-f08/recv_init_f08.F90 | 3 +- ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 | 4 ++- .../use-mpi-f08/sendrecv_replace_f08.F90 | 3 +- .../use-mpi-f08/status_set_cancelled_f08.F90 | 7 ++-- ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 | 7 ++-- .../use-mpi-f08/unpack_external_f08.F90 | 4 ++- ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 | 4 ++- .../fortran/use-mpi-f08/win_attach_f08.F90 | 3 +- .../fortran/use-mpi-f08/win_create_f08.F90 | 3 +- .../fortran/use-mpi-f08/win_detach_f08.F90 | 3 +- ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 | 3 +- 77 files changed, 211 insertions(+), 111 deletions(-) diff --git a/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 index 59dc78231e..979ee41bf4 100644 --- a/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/aint_add_f08.F90 @@ -5,16 +5,17 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" -function MPI_Aint_add_f08(addr1, addr2) +function MPI_Aint_add_f08(base, disp) use :: mpi_f08_types, only : MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_aint_add_f implicit none INTEGER(MPI_ADDRESS_KIND) :: MPI_Aint_add_f08 - INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr1 - INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: addr2 - MPI_Aint_add_f08 = ompi_aint_add_f(addr1, addr2) + INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base + INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: disp + MPI_Aint_add_f08 = ompi_aint_add_f(base, disp) end function MPI_Aint_add_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 index ca7acbe9bb..a153bd02ad 100644 --- a/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/bcast_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -23,4 +24,4 @@ subroutine MPI_Bcast_f08(buffer,count,datatype,root,comm,ierror) call ompi_bcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine MPI_Bcast_f08 +end subroutine MPI_Bcast_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90 index 31e958bc58..2ab9073a60 100644 --- a/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/buffer_attach_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -12,7 +13,7 @@ subroutine MPI_Buffer_attach_f08(buffer,size,ierror) use :: ompi_mpifh_bindings, only : ompi_buffer_attach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer INTEGER, INTENT(IN) :: size INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90 index a0da19933c..ee33b06d98 100644 --- a/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90 @@ -5,13 +5,14 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" subroutine MPI_Buffer_detach_f08(buffer_addr,size,ierror) - use :: ompi_mpifh_bindings, only : ompi_buffer_detach_f USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR + use :: ompi_mpifh_bindings, only : ompi_buffer_detach_f implicit none TYPE(C_PTR), INTENT(OUT) :: buffer_addr INTEGER, INTENT(OUT) :: size diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90 index a360d66b82..c25f43d31e 100644 --- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine MPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, & @@ -12,7 +13,7 @@ subroutine MPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, & use :: mpi_f08_types, only : MPI_Info, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_comm_spawn_f implicit none - CHARACTER(LEN=*), INTENT(IN) :: command, argv + CHARACTER(LEN=*), INTENT(IN) :: command, argv(*) INTEGER, INTENT(IN) :: maxprocs, root TYPE(MPI_Info), INTENT(IN) :: info TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90 index d6d4ae37c3..1dd2d776b6 100644 --- a/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/comm_spawn_multiple_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine MPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, & @@ -15,7 +16,7 @@ subroutine MPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, & implicit none INTEGER, INTENT(IN) :: count, root INTEGER, INTENT(IN) :: array_of_maxprocs(count) - CHARACTER(LEN=*), INTENT(IN) :: array_of_commands(count), array_of_argv(count) + CHARACTER(LEN=*), INTENT(IN) :: array_of_commands(count), array_of_argv(count, *) TYPE(MPI_Info), INTENT(IN) :: array_of_info(count) TYPE(MPI_Comm), INTENT(IN) :: comm TYPE(MPI_Comm), INTENT(OUT) :: intercomm diff --git a/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90 index 07bd1a89b7..8e24f97e72 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ialltoallw_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -17,8 +18,7 @@ subroutine MPI_Ialltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,& OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) - TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*) - TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: recvtypes(*) + TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*) TYPE(MPI_Comm), INTENT(IN) :: comm TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 index 1ea1b56c51..4f01661b9a 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ibcast_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,7 @@ subroutine MPI_Ibcast_f08(buffer,count,datatype,root,comm,request,ierror) use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ibcast_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: buffer + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: buffer INTEGER, INTENT(IN) :: count, root TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Comm), INTENT(IN) :: comm @@ -24,4 +25,4 @@ subroutine MPI_Ibcast_f08(buffer,count,datatype,root,comm,request,ierror) call ompi_ibcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine MPI_Ibcast_f08 +end subroutine MPI_Ibcast_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 index 9d9cf23387..946c9730eb 100644 --- a/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/improbe_f08.F90 @@ -3,6 +3,7 @@ ! Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2010-2012 Los Alamos National Security, LLC. ! All Rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine MPI_Improbe_f08(source,tag,comm,flag,message,status,ierror) @@ -33,4 +34,5 @@ subroutine MPI_Improbe_f08(source,tag,comm,flag,message,status,ierror) call PMPI_Improbe(source,tag,comm%MPI_VAL,flag,message%MPI_VAL,status,c_ierror) if (present(ierror)) ierror = c_ierror + end subroutine MPI_Improbe_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90 index a7879534d5..d2d4eb0eac 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgather_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine MPI_Ineighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvco use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgather_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90 index de8d30a04a..f5c29907f5 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_allgatherv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Ineighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvc use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgatherv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount INTEGER, INTENT(IN) :: recvcounts(*), displs(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90 index 4b1fc585f0..fd55625010 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoall_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Ineighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoall_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90 index 654bec7917..8408d86e1b 100644 --- a/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvb use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoallv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 index 2d3a6eb15e..55ae341d80 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 @@ -9,7 +9,7 @@ ! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2015-2017 Research Organization for Information Science ! and Technology (RIST). All rights reserved. -! Copyright (c) 2017 FUJITSU LIMITED. All rights reserved. +! Copyright (c) 2017-2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ ! ! This file provides the interface specifications for the MPI Fortran @@ -1086,7 +1086,7 @@ subroutine MPI_Ialltoall_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvty !IBM* IGNORE_TKR sendbuf, recvbuf OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf - INTEGER, INTENT(IN) :: sendcount, recvcount + INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm TYPE(MPI_Request), INTENT(OUT) :: request @@ -1128,7 +1128,7 @@ subroutine MPI_Ialltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,recvco INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine MPI_Ialltoallv_f08 end interface MPI_Ialltoallv @@ -1167,7 +1167,7 @@ subroutine MPI_Ialltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,recvbuf,recvc INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*) TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine MPI_Ialltoallw_f08 end interface MPI_Ialltoallw @@ -4690,7 +4690,7 @@ subroutine MPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvb INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine MPI_Ineighbor_alltoallv_f08 end interface MPI_Ineighbor_alltoallv @@ -4731,7 +4731,7 @@ subroutine MPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,recv INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*), recvtypes(*) TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine MPI_Ineighbor_alltoallw_f08 end interface MPI_Ineighbor_alltoallw diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 index 5aa561190f..6e02e8aac2 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 @@ -9,7 +9,7 @@ ! Copyright (c) 2012 Inria. All rights reserved. ! Copyright (c) 2015-2017 Research Organization for Information Science ! and Technology (RIST). All rights reserved. -! Copyright (c) 2017 FUJITSU LIMITED. All rights reserved. +! Copyright (c) 2017-2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ ! ! This file provides the interface specifications for the MPI Fortran @@ -1084,10 +1084,9 @@ subroutine PMPI_Ialltoall_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,recvt !$PRAGMA IGNORE_TKR sendbuf, recvbuf !DIR$ IGNORE_TKR sendbuf, recvbuf !IBM* IGNORE_TKR sendbuf, recvbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf - INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcount - INTEGER, ASYNCHRONOUS :: recvcount + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf + INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm TYPE(MPI_Request), INTENT(OUT) :: request @@ -1129,7 +1128,7 @@ subroutine PMPI_Ialltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,recvc INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine PMPI_Ialltoallv_f08 end interface PMPI_Ialltoallv @@ -1168,7 +1167,7 @@ subroutine PMPI_Ialltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,recvbuf,recv INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*) TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine PMPI_Ialltoallw_f08 end interface PMPI_Ialltoallw @@ -1444,9 +1443,9 @@ subroutine PMPI_Reduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm, !$PRAGMA IGNORE_TKR sendbuf, recvbuf !DIR$ IGNORE_TKR sendbuf, recvbuf !IBM* IGNORE_TKR sendbuf, recvbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf - INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*) + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf + INTEGER, INTENT(IN) :: recvcounts(*) TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Op), INTENT(IN) :: op TYPE(MPI_Comm), INTENT(IN) :: comm @@ -1464,9 +1463,9 @@ subroutine PMPI_Ireduce_scatter_f08(sendbuf,recvbuf,recvcounts,datatype,op,comm, !$PRAGMA IGNORE_TKR sendbuf, recvbuf !DIR$ IGNORE_TKR sendbuf, recvbuf !IBM* IGNORE_TKR sendbuf, recvbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf - INTEGER, INTENT(IN) :: recvcounts(*) + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf + INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*) TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Op), INTENT(IN) :: op TYPE(MPI_Comm), INTENT(IN) :: comm @@ -1544,8 +1543,8 @@ subroutine PMPI_Iscan_f08(sendbuf,recvbuf,count,datatype,op,comm,request,ierror) !$PRAGMA IGNORE_TKR sendbuf, recvbuf !DIR$ IGNORE_TKR sendbuf, recvbuf !IBM* IGNORE_TKR sendbuf, recvbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf - OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf INTEGER, INTENT(IN) :: count TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Op), INTENT(IN) :: op @@ -4691,7 +4690,7 @@ subroutine PMPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recv INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype, recvtype TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine PMPI_Ineighbor_alltoallv_f08 end interface PMPI_Ineighbor_alltoallv @@ -4732,7 +4731,7 @@ subroutine PMPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,rec INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*), recvtypes(*) TYPE(MPI_Comm), INTENT(IN) :: comm - TYPE(MPI_Request), INTENT(IN) :: request + TYPE(MPI_Request), INTENT(OUT) :: request INTEGER, OPTIONAL, INTENT(OUT) :: ierror end subroutine PMPI_Ineighbor_alltoallw_f08 end interface PMPI_Ineighbor_alltoallw diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90 index 77ebbcb049..251a141182 100644 --- a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgather_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine MPI_Neighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvcou use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_allgather_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90 index 93facd3c66..b837ba44ff 100644 --- a/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_allgatherv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Neighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvco use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_allgatherv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount INTEGER, INTENT(IN) :: recvcounts(*), displs(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90 index 77aea7d9b4..1567bef7d5 100644 --- a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoall_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Neighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoall_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90 index 5836540f32..4e3a2e91c5 100644 --- a/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Neighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvbu use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoallv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90 index 99c09a9a55..af84cdac29 100644 --- a/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/pack_external_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -15,7 +16,8 @@ subroutine MPI_Pack_external_f08(datarep,inbuf,incount,datatype,outbuf,outsize, use :: ompi_mpifh_bindings, only : ompi_pack_external_f implicit none CHARACTER(LEN=*), INTENT(IN) :: datarep - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: incount TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: outsize diff --git a/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 index 02f5de2512..bee3d73a0e 100644 --- a/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/pack_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine MPI_Pack_f08(inbuf,incount,datatype,outbuf,outsize,position,comm,ierr use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_pack_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: incount, outsize TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER, INTENT(INOUT) :: position diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90 index a8f1b366f2..d4a21acb5d 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/paccumulate_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -15,7 +16,7 @@ subroutine PMPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_accumulate_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90 index 08d65da8c5..324de48ae7 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/paint_add_f08.F90 @@ -5,16 +5,17 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" -function PMPI_Aint_add_f08(base, diff) +function PMPI_Aint_add_f08(base, disp) use :: mpi_f08_types, only : MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_aint_add_f implicit none INTEGER(MPI_ADDRESS_KIND) :: PMPI_Aint_add_f08 INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: base - INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: diff - PMPI_Aint_add_f08 = ompi_aint_add_f(base, diff) + INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: disp + PMPI_Aint_add_f08 = ompi_aint_add_f(base, disp) end function PMPI_Aint_add_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90 index 737542bbf1..94c7efd7ac 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pbcast_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -23,4 +24,4 @@ subroutine PMPI_Bcast_f08(buffer,count,datatype,root,comm,ierror) call ompi_bcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine PMPI_Bcast_f08 +end subroutine PMPI_Bcast_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90 index e684548629..2be69db7fd 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_attach_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -12,7 +13,7 @@ subroutine PMPI_Buffer_attach_f08(buffer,size,ierror) use :: ompi_mpifh_bindings, only : ompi_buffer_attach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer INTEGER, INTENT(IN) :: size INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90 index bd50696b61..1a758ff4c3 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_keyval_f08.F90 @@ -27,7 +27,7 @@ subroutine PMPI_Comm_create_keyval_f08(comm_copy_attr_fn,comm_delete_attr_fn,& fcopy_fn = c_funloc(comm_copy_attr_fn) fdelete_fn = c_funloc(comm_delete_attr_fn) - call ompi_comm_create_keyval_f(fcopy_fn, fdelete_fn,& + call ompi_comm_create_keyval_f(fcopy_fn,fdelete_fn,& comm_keyval,extra_state,c_ierror) if (present(ierror)) ierror = c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90 index f87155ba1e..ae81928cfc 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, & @@ -12,7 +13,7 @@ subroutine PMPI_Comm_spawn_f08(command,argv,maxprocs,info,root,comm,intercomm, & use :: mpi_f08_types, only : MPI_Info, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_comm_spawn_f implicit none - CHARACTER(LEN=*), INTENT(IN) :: command, argv + CHARACTER(LEN=*), INTENT(IN) :: command, argv(*) INTEGER, INTENT(IN) :: maxprocs, root TYPE(MPI_Info), INTENT(IN) :: info TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90 index dea1f169a6..6f1c00c150 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_spawn_multiple_f08.F90 @@ -6,6 +6,7 @@ ! All Rights reserved. ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, & @@ -16,7 +17,7 @@ subroutine PMPI_Comm_spawn_multiple_f08(count,array_of_commands,array_of_argv, & implicit none INTEGER, INTENT(IN) :: count, root INTEGER, INTENT(IN) :: array_of_maxprocs(count) - CHARACTER(LEN=*), INTENT(IN) :: array_of_commands(count), array_of_argv(count) + CHARACTER(LEN=*), INTENT(IN) :: array_of_commands(count), array_of_argv(count, *) TYPE(MPI_Info), INTENT(IN) :: array_of_info(count) TYPE(MPI_Comm), INTENT(IN) :: comm TYPE(MPI_Comm), INTENT(OUT) :: intercomm diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90 index 0232cecff0..9f6f284bb8 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pcompare_and_swap_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -15,8 +16,8 @@ subroutine PMPI_Compare_and_swap_f08(origin_addr,compare_addr,result_addr,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_compare_and_swap_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr, compare_addr - OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr, compare_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER, INTENT(IN) :: target_rank INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90 index 7e031aedee..bbdc91a4a8 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pfetch_and_op_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,8 +15,8 @@ subroutine PMPI_Fetch_and_op_f08(origin_addr,result_addr,datatype,target_rank, & use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_fetch_and_op_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr - OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER, INTENT(IN) :: target_rank INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90 index c99160b0ac..1ec5228faf 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pfree_mem_f08.F90 @@ -12,7 +12,7 @@ subroutine PMPI_Free_mem_f08(base,ierror) use :: ompi_mpifh_bindings, only : ompi_free_mem_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE,INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90 index 66b223c257..52d16d81bf 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pget_accumulate_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -16,10 +17,10 @@ subroutine PMPI_Get_accumulate_f08(origin_addr,origin_count,origin_datatype,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_get_accumulate_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype - OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr TYPE(MPI_Datatype), INTENT(IN) :: result_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp TYPE(MPI_Datatype), INTENT(IN) :: target_datatype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90 index 9b77132f18..1f4fcbac8a 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pget_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine PMPI_Get_f08(origin_addr,origin_count,origin_datatype,target_rank,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_get_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90 index f05919d3f1..ec8e0ecb90 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pget_processor_name_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Get_processor_name_f08(name,resultlen,ierror) @@ -18,5 +19,4 @@ subroutine PMPI_Get_processor_name_f08(name,resultlen,ierror) call ompi_get_processor_name_f(name,resultlen,c_ierror,len(name)) if (present(ierror)) ierror = c_ierror - end subroutine PMPI_Get_processor_name_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90 index be68659cf3..06bb1a82b3 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pibcast_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -24,4 +25,4 @@ subroutine PMPI_Ibcast_f08(buffer,count,datatype,root,comm,request,ierror) call ompi_ibcast_f(buffer,count,datatype%MPI_VAL,root,comm%MPI_VAL,request%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine PMPI_Ibcast_f08 +end subroutine PMPI_Ibcast_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90 index e219494f03..e7a11a76ea 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pimprobe_f08.F90 @@ -16,6 +16,8 @@ subroutine PMPI_Improbe_f08(source,tag,comm,flag,message,status,ierror) INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror + ! See note in mpi-f-interfaces-bind.h for why we include an + ! interface here and call a PMPI_* subroutine below. interface subroutine PMPI_Improbe(source, tag, comm, flag, message, status, ierror) use :: mpi_f08_types, only : MPI_Status @@ -29,8 +31,6 @@ subroutine PMPI_Improbe_f08(source,tag,comm,flag,message,status,ierror) end subroutine PMPI_Improbe end interface - ! See note in ompi/mpi/fortran/use-mpi-f08/iprobe_f09.F90 about why - ! we call an PMPI_* subroutine here call PMPI_Improbe(source,tag,comm%MPI_VAL,flag,message%MPI_VAL,status,c_ierror) if (present(ierror)) ierror = c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90 index d77c9e4942..750e4358d4 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgather_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine PMPI_Ineighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvc use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgather_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90 index 1968c2272e..d0fb586449 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_allgatherv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Ineighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recv use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_allgatherv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount INTEGER, INTENT(IN) :: recvcounts(*), displs(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90 index 63519f24bc..e54522aec6 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoall_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Ineighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoall_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90 index 5efdd0089d..ced4f992c6 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Ineighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recv use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoallv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 index 2b5cd0a5cd..5e17b850ce 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pineighbor_alltoallw_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Ineighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_ineighbor_alltoallw_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*) INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*) diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90 index 3170e95688..837dd14352 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pinfo_get_f08.F90 @@ -3,6 +3,7 @@ ! Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All Rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Info_get_f08(info,key,valuelen,value,flag,ierror) @@ -19,6 +20,6 @@ subroutine PMPI_Info_get_f08(info,key,valuelen,value,flag,ierror) INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror - call PMPI_Info_get(info%MPI_VAL,key,valuelen,value,flag,c_ierror); + call PMPI_Info_get(info%MPI_VAL,key,valuelen,value,flag,c_ierror) if (present(ierror)) ierror = c_ierror end subroutine PMPI_Info_get_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90 index 385b99baf8..5c4eadda03 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/piprobe_f08.F90 @@ -3,6 +3,7 @@ ! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Iprobe_f08(source,tag,comm,flag,status,ierror) @@ -31,4 +32,5 @@ subroutine PMPI_Iprobe_f08(source,tag,comm,flag,status,ierror) call PMPI_Iprobe(source,tag,comm%MPI_VAL,flag,status,c_ierror) if (present(ierror)) ierror = c_ierror + end subroutine PMPI_Iprobe_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90 index 10f7d3ab2a..aa0a778ab8 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgather_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine PMPI_Neighbor_allgather_f08(sendbuf,sendcount,sendtype,recvbuf,recvco use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_allgather_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90 index 48d25a43d3..512571e948 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_allgatherv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Neighbor_allgatherv_f08(sendbuf,sendcount,sendtype,recvbuf,recvc use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_allgatherv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount INTEGER, INTENT(IN) :: recvcounts(*), displs(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90 index 844173d121..5af98ad064 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoall_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Neighbor_alltoall_f08(sendbuf,sendcount,sendtype,recvbuf,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoall_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, recvcount TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90 index 58a1a1cff1..1ef59e429e 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Neighbor_alltoallv_f08(sendbuf,sendcounts,sdispls,sendtype,recvb use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoallv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 index 7d5535afda..f1fe0d5a73 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pneighbor_alltoallw_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Neighbor_alltoallw_f08(sendbuf,sendcounts,sdispls,sendtypes,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_neighbor_alltoallw_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcounts(*), recvcounts(*) INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: sdispls(*), rdispls(*) TYPE(MPI_Datatype), INTENT(IN) :: sendtypes(*) diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90 index a5bf98e41f..ab6c6d1df7 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_external_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -15,7 +16,8 @@ subroutine PMPI_Pack_external_f08(datarep,inbuf,incount,datatype,outbuf,outsize, use :: ompi_mpifh_bindings, only : ompi_pack_external_f implicit none CHARACTER(LEN=*), INTENT(IN) :: datarep - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: incount TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: outsize diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90 index 7860b1cce9..866668a17f 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/ppack_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine PMPI_Pack_f08(inbuf,incount,datatype,outbuf,outsize,position,comm,ier use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_pack_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: incount, outsize TYPE(MPI_Datatype), INTENT(IN) :: datatype INTEGER, INTENT(INOUT) :: position diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90 index ced762447f..5fe3dd8236 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pput_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine PMPI_Put_f08(origin_addr,origin_count,origin_datatype,target_rank,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_put_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90 index cea5d2f2dc..fbf91d6dbf 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/praccumulate_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -15,7 +16,7 @@ subroutine PMPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_raccumulate_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90 index ac3a8da188..3425aca80b 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/precv_init_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,7 @@ subroutine PMPI_Recv_init_f08(buf,count,datatype,source,tag,comm,request,ierror) use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_recv_init_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf INTEGER, INTENT(IN) :: count, source, tag TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90 index 90eb3ffd8c..06ccfec1d1 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/prget_accumulate_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -16,10 +17,10 @@ subroutine PMPI_Rget_accumulate_f08(origin_addr,origin_count,origin_datatype,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_rget_accumulate_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, result_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype - OMPI_FORTRAN_IGNORE_TKR_TYPE :: result_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: result_addr TYPE(MPI_Datatype), INTENT(IN) :: result_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp TYPE(MPI_Datatype), INTENT(IN) :: target_datatype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90 index 24982b4388..fd7cba0447 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/prget_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine PMPI_Rget_f08(origin_addr,origin_count,origin_datatype,target_rank,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_rget_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90 index bf0eb59270..5a3a4dc6d9 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/prput_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine PMPI_Rput_f08(origin_addr,origin_count,origin_datatype,target_rank,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Win, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_rput_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90 index b01fe08be7..1fe911e963 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Sendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, & use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status use :: ompi_mpifh_bindings, only : ompi_sendrecv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, dest, sendtag, recvcount, source, recvtag TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90 index 1bf25cffe0..7f6bede48f 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/psendrecv_replace_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine PMPI_Sendrecv_replace_f08(buf,count,datatype,dest,sendtag,source, & use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status use :: ompi_mpifh_bindings, only : ompi_sendrecv_replace_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf INTEGER, INTENT(IN) :: count, dest, sendtag, source, recvtag TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90 index 0a6b554f3e..4c035c607b 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/ptype_vector_f08.F90 @@ -5,10 +5,11 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Type_vector_f08(count,blocklength,stride,oldtype,newtype,ierror) - use :: mpi_f08_types, only : MPI_Datatype, MPI_ADDRESS_KIND + use :: mpi_f08_types, only : MPI_Datatype use :: ompi_mpifh_bindings, only : ompi_type_vector_f implicit none INTEGER, INTENT(IN) :: count, blocklength, stride diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90 index c089ece2e3..783eb2e436 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_external_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine PMPI_Unpack_external_f08(datarep,inbuf,insize,position,outbuf,outcoun use :: ompi_mpifh_bindings, only : ompi_unpack_external_f implicit none CHARACTER(LEN=*), INTENT(IN) :: datarep - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: insize INTEGER(MPI_ADDRESS_KIND), INTENT(INOUT) :: position INTEGER, INTENT(IN) :: outcount diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90 index f22b87610d..5ff7784226 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/punpack_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine PMPI_Unpack_f08(inbuf,insize,position,outbuf,outcount,datatype,comm,i use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_unpack_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: insize, outcount INTEGER, INTENT(INOUT) :: position TYPE(MPI_Datatype), INTENT(IN) :: datatype diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90 index 9cde0bf422..c483e7620d 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_attach_f08.F90 @@ -2,6 +2,7 @@ ! ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -10,7 +11,7 @@ subroutine PMPI_Win_attach_f08(win,base,size,ierror) use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_attach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size TYPE(MPI_Win), INTENT(IN) :: win INTEGER, OPTIONAL, INTENT(OUT) :: ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90 index 6c0d72609d..636f0d5b1d 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_create_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,7 @@ subroutine PMPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror) use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_create_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size INTEGER, INTENT(IN) :: disp_unit TYPE(MPI_Info), INTENT(IN) :: info diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90 index 26202444b4..962a6c270a 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_detach_f08.F90 @@ -2,6 +2,7 @@ ! ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -10,7 +11,7 @@ subroutine PMPI_Win_detach_f08(win,base,ierror) use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_detach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base TYPE(MPI_Win), INTENT(IN) :: win INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90 index ba8050b0f5..0961908dfb 100644 --- a/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pwin_sync_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine PMPI_Win_sync_f08(win,ierror) @@ -18,4 +19,4 @@ subroutine PMPI_Win_sync_f08(win,ierror) call ompi_win_sync_f(win%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine PMPI_Win_sync_f08 +end subroutine PMPI_Win_sync_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90 index 8ec0eabe2c..2e07d07766 100644 --- a/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/raccumulate_f08.F90 @@ -15,7 +15,7 @@ subroutine MPI_Raccumulate_f08(origin_addr,origin_count,origin_datatype,& use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_Request, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_raccumulate_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN),ASYNCHRONOUS :: origin_addr + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr INTEGER, INTENT(IN) :: origin_count, target_rank, target_count TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp diff --git a/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90 index 877e7da859..70491ffd16 100644 --- a/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/recv_init_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,7 @@ subroutine MPI_Recv_init_f08(buf,count,datatype,source,tag,comm,request,ierror) use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request use :: ompi_mpifh_bindings, only : ompi_recv_init_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf INTEGER, INTENT(IN) :: count, source, tag TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 index 8166e663a6..44bb08570f 100644 --- a/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/sendrecv_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Sendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, & use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status use :: ompi_mpifh_bindings, only : ompi_sendrecv_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf, recvbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: recvbuf INTEGER, INTENT(IN) :: sendcount, dest, sendtag, recvcount, source, recvtag TYPE(MPI_Datatype), INTENT(IN) :: sendtype TYPE(MPI_Datatype), INTENT(IN) :: recvtype diff --git a/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90 index 2fbad9427e..a1d56ef662 100644 --- a/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/sendrecv_replace_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,7 @@ subroutine MPI_Sendrecv_replace_f08(buf,count,datatype,dest,sendtag,source, & use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status use :: ompi_mpifh_bindings, only : ompi_sendrecv_replace_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: buf INTEGER, INTENT(IN) :: count, dest, sendtag, source, recvtag TYPE(MPI_Datatype), INTENT(IN) :: datatype TYPE(MPI_Comm), INTENT(IN) :: comm diff --git a/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90 index 648e1b48c4..d8f0e0cf37 100644 --- a/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/status_set_cancelled_f08.F90 @@ -3,6 +3,7 @@ ! Copyright (c) 2010-2018 Cisco Systems, Inc. All rights reserved ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All Rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine MPI_Status_set_cancelled_f08(status,flag,ierror) @@ -13,13 +14,15 @@ subroutine MPI_Status_set_cancelled_f08(status,flag,ierror) INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror + ! See note in mpi-f-interfaces-bind.h for why we include an + ! interface here and call a PMPI_* subroutine below. interface - subroutine MPI_Status_set_cancelled(status, flag, ierror) + subroutine PMPI_Status_set_cancelled(status, flag, ierror) use :: mpi_f08_types, only : MPI_Status type(MPI_Status), intent(inout) :: status logical, intent(in) :: flag integer, intent(out) :: ierror - end subroutine MPI_Status_set_cancelled + end subroutine PMPI_Status_set_cancelled end interface call PMPI_Status_set_cancelled(status,flag,c_ierror) diff --git a/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 index 5a9b13c5d8..b9b1e0a0de 100644 --- a/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/type_dup_f08.F90 @@ -5,18 +5,19 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ -subroutine MPI_Type_dup_f08(datatype,newtype,ierror) +subroutine MPI_Type_dup_f08(oldtype,newtype,ierror) use :: mpi_f08_types, only : MPI_Datatype use :: ompi_mpifh_bindings, only : ompi_type_dup_f implicit none - TYPE(MPI_Datatype), INTENT(IN) :: datatype + TYPE(MPI_Datatype), INTENT(IN) :: oldtype TYPE(MPI_Datatype), INTENT(OUT) :: newtype INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror - call ompi_type_dup_f(datatype%MPI_VAL,newtype%MPI_VAL,c_ierror) + call ompi_type_dup_f(oldtype%MPI_VAL,newtype%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror end subroutine MPI_Type_dup_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90 index c77178240b..5cbd47c5e2 100644 --- a/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/unpack_external_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -14,7 +15,8 @@ subroutine MPI_Unpack_external_f08(datarep,inbuf,insize,position,outbuf,outcount use :: ompi_mpifh_bindings, only : ompi_unpack_external_f implicit none CHARACTER(LEN=*), INTENT(IN) :: datarep - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: insize INTEGER(MPI_ADDRESS_KIND), INTENT(INOUT) :: position INTEGER, INTENT(IN) :: outcount diff --git a/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 index 4e1b6719b7..929a58ebda 100644 --- a/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/unpack_f08.F90 @@ -5,6 +5,7 @@ ! All rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,8 @@ subroutine MPI_Unpack_f08(inbuf,insize,position,outbuf,outcount,datatype,comm,ie use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm use :: ompi_mpifh_bindings, only : ompi_unpack_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf, outbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: inbuf + OMPI_FORTRAN_IGNORE_TKR_TYPE :: outbuf INTEGER, INTENT(IN) :: insize, outcount INTEGER, INTENT(INOUT) :: position TYPE(MPI_Datatype), INTENT(IN) :: datatype diff --git a/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90 index bad1e0d1df..f932ed50b6 100644 --- a/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/win_attach_f08.F90 @@ -2,6 +2,7 @@ ! ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -10,7 +11,7 @@ subroutine MPI_Win_attach_f08(win,base,size,ierror) use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_attach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size TYPE(MPI_Win), INTENT(IN) :: win INTEGER, OPTIONAL, INTENT(OUT) :: ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90 index 19236d8499..4e24943fb8 100644 --- a/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/win_create_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -13,7 +14,7 @@ subroutine MPI_Win_create_f08(base,size,disp_unit,info,comm,win,ierror) use :: mpi_f08_types, only : MPI_Info, MPI_Comm, MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_create_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: size INTEGER, INTENT(IN) :: disp_unit TYPE(MPI_Info), INTENT(IN) :: info diff --git a/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90 index 9ed8549161..976333a118 100644 --- a/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/win_detach_f08.F90 @@ -2,6 +2,7 @@ ! ! Copyright (c) 2015-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ #include "ompi/mpi/fortran/configure-fortran-output.h" @@ -10,7 +11,7 @@ subroutine MPI_Win_detach_f08(win,base,ierror) use :: mpi_f08_types, only : MPI_Win, MPI_ADDRESS_KIND use :: ompi_mpifh_bindings, only : ompi_win_detach_f implicit none - OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: base + OMPI_FORTRAN_IGNORE_TKR_TYPE :: base TYPE(MPI_Win), INTENT(IN) :: win INTEGER, OPTIONAL, INTENT(OUT) :: ierror integer :: c_ierror diff --git a/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 index 8d9cb324c4..fa3f21cbf5 100644 --- a/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/win_sync_f08.F90 @@ -5,6 +5,7 @@ ! All Rights reserved. ! Copyright (c) 2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. +! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ subroutine MPI_Win_sync_f08(win,ierror) @@ -18,4 +19,4 @@ subroutine MPI_Win_sync_f08(win,ierror) call ompi_win_sync_f(win%MPI_VAL,c_ierror) if (present(ierror)) ierror = c_ierror - end subroutine MPI_Win_sync_f08 +end subroutine MPI_Win_sync_f08