Skip to content

Commit

Permalink
fortran MPI_Waitall array_of_requests etc to dimension(*)
Browse files Browse the repository at this point in the history
Looking at the 3rd language binding for each MPI function, eg
the fortran "USE mpi" or "INCLUDE ’mpif.h’" binding, I looked
at the various lines that had "dimension" and "array_of_...".
There were several things like MPI_Waitall where I changed
-  integer, dimension(count), intent(inout) :: array_of_requests
+  integer, dimension(*), intent(inout) :: array_of_requests
and maybe one array_of_statuses for a spawn call

Signed-off-by: Mark Allen <markalle@us.ibm.com>
  • Loading branch information
markalle committed Oct 19, 2021
1 parent 8e318a5 commit 069a36d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
! reserved.
! Copyright (c) 2015-2020 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! Copyright (c) 2021 IBM Corporation. All rights reserved.
! $COPYRIGHT$
!
! Additional copyrights may follow
Expand Down Expand Up @@ -3679,7 +3680,7 @@ interface
subroutine MPI_Testall(count, array_of_requests, flag, array_of_statuses, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
logical, intent(out) :: flag
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
integer, intent(out) :: ierror
Expand All @@ -3694,7 +3695,7 @@ subroutine MPI_Testany(count, array_of_requests, index, flag, status&
, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: index
logical, intent(out) :: flag
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
Expand All @@ -3710,7 +3711,7 @@ subroutine MPI_Testsome(incount, array_of_requests, outcount, array_of_indices,
, ierror)
include 'mpif-config.h'
integer, intent(in) :: incount
integer, dimension(incount), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: outcount
integer, dimension(*), intent(out) :: array_of_indices
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
Expand Down Expand Up @@ -4242,7 +4243,7 @@ interface
subroutine MPI_Waitall(count, array_of_requests, array_of_statuses, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
integer, intent(out) :: ierror
end subroutine MPI_Waitall
Expand All @@ -4255,7 +4256,7 @@ interface
subroutine MPI_Waitany(count, array_of_requests, index, status, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: index
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
integer, intent(out) :: ierror
Expand Down
15 changes: 8 additions & 7 deletions ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
! Copyright (c) 2006-2021 Cisco Systems, Inc. All rights reserved
! Copyright (c) 2016-2018 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! Copyright (c) 2021 IBM Corporation. All rights reserved.
! $COPYRIGHT$
!
! Additional copyrights may follow
Expand Down Expand Up @@ -1336,9 +1337,9 @@ interface
subroutine MPI_Testall(count, array_of_requests, flag, array_of_statuses, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
logical, intent(out) :: flag
integer, dimension(MPI_STATUS_SIZE, count), intent(out) :: array_of_statuses
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
integer, intent(out) :: ierror
end subroutine MPI_Testall

Expand All @@ -1351,7 +1352,7 @@ subroutine MPI_Testany(count, array_of_requests, index, flag, status&
, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: index
logical, intent(out) :: flag
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
Expand All @@ -1367,7 +1368,7 @@ subroutine MPI_Testsome(incount, array_of_requests, outcount, array_of_indices,
, ierror)
include 'mpif-config.h'
integer, intent(in) :: incount
integer, dimension(incount), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: outcount
integer, dimension(*), intent(out) :: array_of_indices
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
Expand Down Expand Up @@ -1830,7 +1831,7 @@ interface
subroutine MPI_Waitall(count, array_of_requests, array_of_statuses, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
integer, intent(out) :: ierror
end subroutine MPI_Waitall
Expand All @@ -1843,7 +1844,7 @@ interface
subroutine MPI_Waitany(count, array_of_requests, index, status, ierror)
include 'mpif-config.h'
integer, intent(in) :: count
integer, dimension(count), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: index
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
integer, intent(out) :: ierror
Expand All @@ -1858,7 +1859,7 @@ subroutine MPI_Waitsome(incount, array_of_requests, outcount, array_of_indices,
, ierror)
include 'mpif-config.h'
integer, intent(in) :: incount
integer, dimension(incount), intent(inout) :: array_of_requests
integer, dimension(*), intent(inout) :: array_of_requests
integer, intent(out) :: outcount
integer, dimension(*), intent(out) :: array_of_indices
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
Expand Down

0 comments on commit 069a36d

Please sign in to comment.