Skip to content

Commit bd2b80b

Browse files
ggouaillardetjsquyres
ggouaillardet
authored and
jsquyres
committed
use-mpi-f08: fix ASYNCHRONOUS and INTENT
Add a bunch of ASYNCHRONOUSs and INTENTs that were missing. All instances of ASYNCHRONOUS were added as OMPI_ASYNCHRONOUS (and a bunch of existing instances of ASYNCHRONOUS were updated to OMPI_ASYNCHRONOUS) so that we can properly handle compilers that do not support ASYNCHRONOUS. Subroutines that had [OMPI_]ASYNCHRONOUS or INTENTs added were: - MPI_Aint_add - MPI_Aint_diff - MPI_Accumulate - MPI_Bsend_init - MPI_Comm_idup - MPI_Compare_and_swap - MPI_F_sync_reg - MPI_Fetch_and_op - MPI_File_iread* - MPI_File_iwrite* - MPI_File_read_all_begin - MPI_File_read_all_end - MPI_File_read_at_all_begin - MPI_File_read_at_all_end - MPI_File_read_ordered_begin - MPI_File_read_ordered_end - MPI_File_write_all_begin - MPI_File_write_all_end - MPI_File_write_at_all - MPI_File_write_at_all_begin - MPI_File_write_at_all_end - MPI_File_write_ordered_begin - MPI_File_write_ordered_end - MPI_Get - MPI_Get_accumulate - MPI_Get_address - MPI_Ialltoall - MPI_Ibsend - MPI_Improbe - MPI_Imrecv - MPI_Ineighbor_allgather - MPI_Ineighbor_allgatherv - MPI_Ineighbor_alltoall - MPI_Ineighbor_alltoallv - MPI_Ineighbor_alltoallw - MPI_Iprobe - MPI_Irecv - MPI_Irsend - MPI_Isend - MPI_Issend - MPI_Mprobe - MPI_Probe - MPI_Put - MPI_Raccumulate - MPI_Recv_init - MPI_Rget - MPI_Rget_accumulate - MPI_Rput - MPI_Rsend_init - MPI_Send_init - MPI_Ssend_init - MPI_Win_attach - MPI_Win_create - MPI_Win_detach - MPI_Win_get_info Subroutines that just had ASYNCHRONOUS updated to OMPI_ASYNCHRONOUS are not included in the list above. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp> Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent 83eb116 commit bd2b80b

File tree

94 files changed

+570
-567
lines changed

Some content is hidden

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

94 files changed

+570
-567
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2010-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All Rights reserved.
66
! Copyright (c) 2018-2020 Research Organization for Information Science
@@ -17,7 +17,7 @@ subroutine MPI_Accumulate_f08(origin_addr,origin_count,origin_datatype,&
1717
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Win, MPI_ADDRESS_KIND
1818
use :: ompi_mpifh_bindings, only : ompi_accumulate_f
1919
implicit none
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: origin_addr
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: origin_addr
2121
INTEGER, INTENT(IN) :: origin_count, target_rank, target_count
2222
TYPE(MPI_Datatype), INTENT(IN) :: origin_datatype
2323
INTEGER(MPI_ADDRESS_KIND), INTENT(IN) :: target_disp

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -16,8 +16,8 @@ subroutine MPI_Allgather_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcount,r
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1717
use :: ompi_mpifh_bindings, only : ompi_allgather_init_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
2121
INTEGER, INTENT(IN) :: sendcount, recvcount
2222
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2323
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -17,10 +17,10 @@ subroutine MPI_Allgatherv_init_f08(sendbuf,sendcount,sendtype,recvbuf,recvcounts
1717
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1818
use :: ompi_mpifh_bindings, only : ompi_allgatherv_init_f
1919
implicit none
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
21-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
21+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
2222
INTEGER, INTENT(IN) :: sendcount
23-
INTEGER, INTENT(IN), ASYNCHRONOUS :: recvcounts(*), displs(*)
23+
INTEGER, INTENT(IN) OMPI_ASYNCHRONOUS :: recvcounts(*), displs(*)
2424
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2525
TYPE(MPI_Datatype), INTENT(IN) :: recvtype
2626
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -16,8 +16,8 @@ subroutine MPI_Allreduce_init_f08(sendbuf,recvbuf,count,datatype,op,comm,info,re
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Op, MPI_Comm, MPI_Info, MPI_Request
1717
use :: ompi_mpifh_bindings, only : ompi_allreduce_init_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
2121
INTEGER, INTENT(IN) :: count
2222
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2323
TYPE(MPI_Op), INTENT(IN) :: op

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -17,8 +17,8 @@ subroutine MPI_Alltoall_init_f08(sendbuf,sendcount,sendtype,recvbuf,&
1717
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1818
use :: ompi_mpifh_bindings, only : ompi_alltoall_init_f
1919
implicit none
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
21-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
21+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
2222
INTEGER, INTENT(IN) :: sendcount, recvcount
2323
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2424
TYPE(MPI_Datatype), INTENT(IN) :: recvtype

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -17,9 +17,9 @@ subroutine MPI_Alltoallv_init_f08(sendbuf,sendcounts,sdispls,sendtype,recvbuf,&
1717
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1818
use :: ompi_mpifh_bindings, only : ompi_alltoallv_init_f
1919
implicit none
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
21-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
22-
INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
21+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
22+
INTEGER, INTENT(IN) OMPI_ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
2323
TYPE(MPI_Datatype), INTENT(IN) :: sendtype
2424
TYPE(MPI_Datatype), INTENT(IN) :: recvtype
2525
TYPE(MPI_Comm), INTENT(IN) :: comm

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -17,10 +17,10 @@ subroutine MPI_Alltoallw_init_f08(sendbuf,sendcounts,sdispls,sendtypes,&
1717
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1818
use :: ompi_mpifh_bindings, only : ompi_alltoallw_init_f
1919
implicit none
20-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN), ASYNCHRONOUS :: sendbuf
21-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: recvbuf
22-
INTEGER, INTENT(IN), ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
23-
TYPE(MPI_Datatype), INTENT(IN), ASYNCHRONOUS :: sendtypes(*), recvtypes(*)
20+
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) OMPI_ASYNCHRONOUS :: sendbuf
21+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: recvbuf
22+
INTEGER, INTENT(IN) OMPI_ASYNCHRONOUS :: sendcounts(*), sdispls(*), recvcounts(*), rdispls(*)
23+
TYPE(MPI_Datatype), INTENT(IN) OMPI_ASYNCHRONOUS :: sendtypes(*), recvtypes(*)
2424
TYPE(MPI_Comm), INTENT(IN) :: comm
2525
TYPE(MPI_Info), INTENT(IN) :: info
2626
TYPE(MPI_Request), INTENT(OUT) :: request

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2018-2021 Research Organization for Information Science
@@ -16,7 +16,7 @@ subroutine MPI_Bcast_init_f08(buffer,count,datatype,root,comm,info,request,ierro
1616
use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Info, MPI_Request
1717
use :: ompi_mpifh_bindings, only : ompi_bcast_init_f
1818
implicit none
19-
OMPI_FORTRAN_IGNORE_TKR_TYPE, ASYNCHRONOUS :: buffer
19+
OMPI_FORTRAN_IGNORE_TKR_TYPE OMPI_ASYNCHRONOUS :: buffer
2020
INTEGER, INTENT(IN) :: count, root
2121
TYPE(MPI_Datatype), INTENT(IN) :: datatype
2222
TYPE(MPI_Comm), INTENT(IN) :: comm

0 commit comments

Comments
 (0)