Skip to content

Commit 6a0bca6

Browse files
gpaulsengpaulsen
authored
Merge pull request #9608 from markalle/fortran_rank_v508x
v5.0.x: fortran MPI_Waitall array_of_requests etc to dimension(*)
2 parents ab935d1 + 81284b0 commit 6a0bca6

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h.in‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
! Copyright (c) 2015-2020 Research Organization for Information Science
1313
! and Technology (RIST). All rights reserved.
1414
! Copyright (c) 2021 Bull S.A.S. All rights reserved.
15+
! Copyright (c) 2021 IBM Corporation. All rights reserved.
1516
! $COPYRIGHT$
1617
!
1718
! Additional copyrights may follow
@@ -3681,7 +3682,7 @@ interface
36813682
subroutine MPI_Testall(count, array_of_requests, flag, array_of_statuses, ierror)
36823683
include 'mpif-config.h'
36833684
integer, intent(in) :: count
3684-
integer, dimension(count), intent(inout) :: array_of_requests
3685+
integer, dimension(*), intent(inout) :: array_of_requests
36853686
logical, intent(out) :: flag
36863687
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
36873688
integer, intent(out) :: ierror
@@ -3696,7 +3697,7 @@ subroutine MPI_Testany(count, array_of_requests, index, flag, status&
36963697
, ierror)
36973698
include 'mpif-config.h'
36983699
integer, intent(in) :: count
3699-
integer, dimension(count), intent(inout) :: array_of_requests
3700+
integer, dimension(*), intent(inout) :: array_of_requests
37003701
integer, intent(out) :: index
37013702
logical, intent(out) :: flag
37023703
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
@@ -3712,7 +3713,7 @@ subroutine MPI_Testsome(incount, array_of_requests, outcount, array_of_indices,
37123713
, ierror)
37133714
include 'mpif-config.h'
37143715
integer, intent(in) :: incount
3715-
integer, dimension(incount), intent(inout) :: array_of_requests
3716+
integer, dimension(*), intent(inout) :: array_of_requests
37163717
integer, intent(out) :: outcount
37173718
integer, dimension(*), intent(out) :: array_of_indices
37183719
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
@@ -4244,7 +4245,7 @@ interface
42444245
subroutine MPI_Waitall(count, array_of_requests, array_of_statuses, ierror)
42454246
include 'mpif-config.h'
42464247
integer, intent(in) :: count
4247-
integer, dimension(count), intent(inout) :: array_of_requests
4248+
integer, dimension(*), intent(inout) :: array_of_requests
42484249
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
42494250
integer, intent(out) :: ierror
42504251
end subroutine MPI_Waitall
@@ -4257,7 +4258,7 @@ interface
42574258
subroutine MPI_Waitany(count, array_of_requests, index, status, ierror)
42584259
include 'mpif-config.h'
42594260
integer, intent(in) :: count
4260-
integer, dimension(count), intent(inout) :: array_of_requests
4261+
integer, dimension(*), intent(inout) :: array_of_requests
42614262
integer, intent(out) :: index
42624263
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
42634264
integer, intent(out) :: ierror
@@ -4272,7 +4273,7 @@ subroutine MPI_Waitsome(incount, array_of_requests, outcount, array_of_indices,
42724273
, ierror)
42734274
include 'mpif-config.h'
42744275
integer, intent(in) :: incount
4275-
integer, dimension(incount), intent(inout) :: array_of_requests
4276+
integer, dimension(*), intent(inout) :: array_of_requests
42764277
integer, intent(out) :: outcount
42774278
integer, dimension(*), intent(out) :: array_of_indices
42784279
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses

‎ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
! Copyright (c) 2016-2018 Research Organization for Information Science
1515
! and Technology (RIST). All rights reserved.
1616
! Copyright (c) 2021 Sandia National Laboratories. All rights reserved.
17+
! Copyright (c) 2021 IBM Corporation. All rights reserved.
1718
! $COPYRIGHT$
1819
!
1920
! Additional copyrights may follow
@@ -1384,9 +1385,9 @@ interface
13841385
subroutine MPI_Testall(count, array_of_requests, flag, array_of_statuses, ierror)
13851386
include 'mpif-config.h'
13861387
integer, intent(in) :: count
1387-
integer, dimension(count), intent(inout) :: array_of_requests
1388+
integer, dimension(*), intent(inout) :: array_of_requests
13881389
logical, intent(out) :: flag
1389-
integer, dimension(MPI_STATUS_SIZE, count), intent(out) :: array_of_statuses
1390+
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
13901391
integer, intent(out) :: ierror
13911392
end subroutine MPI_Testall
13921393

@@ -1399,7 +1400,7 @@ subroutine MPI_Testany(count, array_of_requests, index, flag, status&
13991400
, ierror)
14001401
include 'mpif-config.h'
14011402
integer, intent(in) :: count
1402-
integer, dimension(count), intent(inout) :: array_of_requests
1403+
integer, dimension(*), intent(inout) :: array_of_requests
14031404
integer, intent(out) :: index
14041405
logical, intent(out) :: flag
14051406
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
@@ -1415,7 +1416,7 @@ subroutine MPI_Testsome(incount, array_of_requests, outcount, array_of_indices,
14151416
, ierror)
14161417
include 'mpif-config.h'
14171418
integer, intent(in) :: incount
1418-
integer, dimension(incount), intent(inout) :: array_of_requests
1419+
integer, dimension(*), intent(inout) :: array_of_requests
14191420
integer, intent(out) :: outcount
14201421
integer, dimension(*), intent(out) :: array_of_indices
14211422
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
@@ -1878,7 +1879,7 @@ interface
18781879
subroutine MPI_Waitall(count, array_of_requests, array_of_statuses, ierror)
18791880
include 'mpif-config.h'
18801881
integer, intent(in) :: count
1881-
integer, dimension(count), intent(inout) :: array_of_requests
1882+
integer, dimension(*), intent(inout) :: array_of_requests
18821883
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses
18831884
integer, intent(out) :: ierror
18841885
end subroutine MPI_Waitall
@@ -1891,7 +1892,7 @@ interface
18911892
subroutine MPI_Waitany(count, array_of_requests, index, status, ierror)
18921893
include 'mpif-config.h'
18931894
integer, intent(in) :: count
1894-
integer, dimension(count), intent(inout) :: array_of_requests
1895+
integer, dimension(*), intent(inout) :: array_of_requests
18951896
integer, intent(out) :: index
18961897
integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
18971898
integer, intent(out) :: ierror
@@ -1906,7 +1907,7 @@ subroutine MPI_Waitsome(incount, array_of_requests, outcount, array_of_indices,
19061907
, ierror)
19071908
include 'mpif-config.h'
19081909
integer, intent(in) :: incount
1909-
integer, dimension(incount), intent(inout) :: array_of_requests
1910+
integer, dimension(*), intent(inout) :: array_of_requests
19101911
integer, intent(out) :: outcount
19111912
integer, dimension(*), intent(out) :: array_of_indices
19121913
integer, dimension(MPI_STATUS_SIZE, *), intent(out) :: array_of_statuses

0 commit comments

Comments
 (0)