Skip to content

Commit 0e3b111

Browse files
author
rhc54
committed
Merge pull request open-mpi#876 from ggouaillardet/topic/v1.10/mpi_neighbor_alltoallx_fixes
Topic/v1.10/mpi neighbor alltoallx fixes
2 parents d7b5b25 + 4c81052 commit 0e3b111

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3613,12 +3613,12 @@ subroutine MPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recv
36133613
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
36143614
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
36153615
integer, dimension(*), intent(in) :: sendcounts
3616-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
3616+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
36173617
integer, dimension(*), intent(in) :: sendtypes
36183618
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
36193619
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
36203620
integer, dimension(*), intent(in) :: recvcounts
3621-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
3621+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
36223622
integer, dimension(*), intent(in) :: recvtypes
36233623
integer, intent(in) :: comm
36243624
integer, intent(out) :: request
@@ -3635,12 +3635,12 @@ subroutine PMPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, rec
36353635
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
36363636
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
36373637
integer, dimension(*), intent(in) :: sendcounts
3638-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
3638+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
36393639
integer, dimension(*), intent(in) :: sendtypes
36403640
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
36413641
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
36423642
integer, dimension(*), intent(in) :: recvcounts
3643-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
3643+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
36443644
integer, dimension(*), intent(in) :: recvtypes
36453645
integer, intent(in) :: comm
36463646
integer, intent(out) :: request
@@ -4675,12 +4675,12 @@ subroutine MPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvb
46754675
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
46764676
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
46774677
integer, dimension(*), intent(in) :: sendcounts
4678-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
4678+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
46794679
integer, dimension(*), intent(in) :: sendtypes
46804680
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
46814681
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
46824682
integer, dimension(*), intent(in) :: recvcounts
4683-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
4683+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
46844684
integer, dimension(*), intent(in) :: recvtypes
46854685
integer, intent(in) :: comm
46864686
integer, intent(out) :: ierror
@@ -4696,12 +4696,12 @@ subroutine PMPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recv
46964696
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ sendbuf
46974697
@OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: sendbuf
46984698
integer, dimension(*), intent(in) :: sendcounts
4699-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
4699+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: sdispls
47004700
integer, dimension(*), intent(in) :: sendtypes
47014701
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ recvbuf
47024702
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: recvbuf
47034703
integer, dimension(*), intent(in) :: recvcounts
4704-
integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
4704+
integer(kind=MPI_ADDRESS_KIND), dimension(*), intent(in) :: rdispls
47054705
integer, dimension(*), intent(in) :: recvtypes
47064706
integer, intent(in) :: comm
47074707
integer, intent(out) :: ierror

‎ompi/mpi/man/man3/MPI_Neighbor_alltoallv.3in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
.nf
1616
#include <mpi.h>
1717
int MPI_Neighbor_alltoallv(const void *\fIsendbuf\fP, const int \fIsendcounts\fP[],
18-
const int \fIsdispls\f[]P, MPI_Datatype \fIsendtype\fP,
18+
const int \fIsdispls\fP[], MPI_Datatype \fIsendtype\fP,
1919
void *\fIrecvbuf\fP, const int\fI recvcounts\fP[],
2020
const int \fIrdispls\fP[], MPI_Datatype \fIrecvtype\fP, MPI_Comm \fIcomm\fP)
2121

2222
int MPI_Ineighbor_alltoallv(const void *\fIsendbuf\fP, const int \fIsendcounts\fP[],
23-
const int \fIsdispls\f[]P, MPI_Datatype \fIsendtype\fP,
23+
const int \fIsdispls\fP[], MPI_Datatype \fIsendtype\fP,
2424
void *\fIrecvbuf\fP, const int\fI recvcounts\fP[],
2525
const int \fIrdispls\fP[], MPI_Datatype \fIrecvtype\fP, MPI_Comm \fIcomm\fP,
26-
MPI_Request \fI*request\fP)
26+
MPI_Request \fI*request\fP)
2727

2828
.fi
2929
.SH Fortran Syntax

‎ompi/mpi/man/man3/MPI_Neighbor_alltoallw.3in‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
.nf
1717
#include <mpi.h>
1818
int MPI_Neighbor_alltoallw(const void *\fIsendbuf\fP, const int \fIsendcounts\fP[],
19-
const int \fIsdispls\fP[], const MPI_Datatype \fIsendtypes\fP[],
20-
void *\fIrecvbuf\fP, const int \fIrecvcounts\fP[], const int \fIrdispls\fP[],
21-
const MPI_Datatype \fIrecvtypes\fP[], MPI_Comm \fIcomm\fP)
19+
const MPI_Aint \fIsdispls\fP[], const MPI_Datatype \fIsendtypes\fP[],
20+
void *\fIrecvbuf\fP, const int \fIrecvcounts\fP[], const MPI_Aint \fIrdispls\fP[],
21+
const MPI_Datatype \fIrecvtypes\fP[], MPI_Comm \fIcomm\fP)
2222

2323
int MPI_Ineighbor_alltoallw(const void *\fIsendbuf\fP, const int \fIsendcounts\fP[],
24-
const int \fIsdispls\fP[], const MPI_Datatype \fIsendtypes\fP[],
25-
void *\fIrecvbuf\fP, const int \fIrecvcounts\fP[], const int \fIrdispls\fP[],
26-
const MPI_Datatype \fIrecvtypes\fP[], MPI_Comm \fIcomm\fP, MPI_Request \fI*request\fP)
24+
const MPI_Aint \fIsdispls\fP[], const MPI_Datatype \fIsendtypes\fP[],
25+
void *\fIrecvbuf\fP, const int \fIrecvcounts\fP[], const MPI_Aint \fIrdispls\fP[],
26+
const MPI_Datatype \fIrecvtypes\fP[], MPI_Comm \fIcomm\fP, MPI_Request \fI*request\fP)
2727

2828
.fi
2929
.SH Fortran Syntax
@@ -33,16 +33,18 @@ MPI_NEIGHBOR_ALLTOALLW(\fISENDBUF, SENDCOUNTS, SDISPLS, SENDTYPES,
3333
RECVBUF, RECVCOUNTS, RDISPLS, RECVTYPES, COMM, IERROR\fP)
3434

3535
<type> \fISENDBUF(*), RECVBUF(*)\fP
36-
INTEGER \fISENDCOUNTS(*), SDISPLS(*), SENDTYPES(*)\fP
37-
INTEGER \fIRECVCOUNTS(*), RDISPLS(*), RECVTYPES(*)\fP
36+
INTEGER \fISENDCOUNTS(*), SENDTYPES(*)\fP
37+
INTEGER \fIRECVCOUNTS(*), RECVTYPES(*)\fP
38+
INTEGER(KIND=MPI_ADDRESS_KIND) \fISDISPLS(*), RDISPLS(*)\fP
3839
INTEGER \fICOMM, IERROR\fP
3940

4041
MPI_INEIGHBOR_ALLTOALLW(\fISENDBUF, SENDCOUNTS, SDISPLS, SENDTYPES,
4142
RECVBUF, RECVCOUNTS, RDISPLS, RECVTYPES, COMM, REQUEST, IERROR\fP)
4243

4344
<type> \fISENDBUF(*), RECVBUF(*)\fP
44-
INTEGER \fISENDCOUNTS(*), SDISPLS(*), SENDTYPES(*)\fP
45-
INTEGER \fIRECVCOUNTS(*), RDISPLS(*), RECVTYPES(*)\fP
45+
INTEGER \fISENDCOUNTS(*), SENDTYPES(*)\fP
46+
INTEGER \fIRECVCOUNTS(*), RECVTYPES(*)\fP
47+
INTEGER(KIND=MPI_ADDRESS_KIND) \fISDISPLS(*), RDISPLS(*)\fP
4648
INTEGER \fICOMM, REQUEST, IERROR\fP
4749

4850
.fi

0 commit comments

Comments
 (0)