From 121bbe5e7f6247569a389e41881079182d2b976c Mon Sep 17 00:00:00 2001 From: Mark Allen Date: Tue, 19 Oct 2021 17:53:07 -0500 Subject: [PATCH] fortran MPI_Waitall array_of_requests etc to dimension(*) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../mpi-ignore-tkr-interfaces.h.in | 13 +++++++------ ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h | 15 ++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in index 6d74ce40ac7..cf3d5007345 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in @@ -12,6 +12,7 @@ ! Copyright (c) 2015-2020 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! Copyright (c) 2021 Bull S.A.S. All rights reserved. +! Copyright (c) 2021 IBM Corporation. All rights reserved. ! $COPYRIGHT$ ! ! Additional copyrights may follow @@ -3682,7 +3683,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 @@ -3697,7 +3698,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 @@ -3713,7 +3714,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 @@ -4245,7 +4246,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 @@ -4258,7 +4259,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 @@ -4273,7 +4274,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 diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h index 34a391b53b1..4dcabecca60 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h +++ b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h @@ -14,6 +14,7 @@ ! Copyright (c) 2016-2018 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! Copyright (c) 2021 Sandia National Laboratories. All rights reserved. +! Copyright (c) 2021 IBM Corporation. All rights reserved. ! $COPYRIGHT$ ! ! Additional copyrights may follow @@ -1384,9 +1385,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 @@ -1399,7 +1400,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 @@ -1415,7 +1416,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 @@ -1878,7 +1879,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 @@ -1891,7 +1892,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 @@ -1906,7 +1907,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