Skip to content

Commit 5ddf0f6

Browse files
committed
mpi/fortran: Fix IN_PLACE detection of ISCATTER(V)
Blocking `MPI_SCATTER` and `MPI_SCATTERV` were fixed in 506d0e9 but noblocking `MPI_ISCATTER` and `MPI_ISCATTERV` were not fixed yet. Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>
1 parent 1f4829b commit 5ddf0f6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ompi/mpi/fortran/mpif-h/iscatter_f.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2015 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
15+
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -81,8 +82,8 @@ void ompi_iscatter_f(char *sendbuf, MPI_Fint *sendcount,
8182
c_sendtype = PMPI_Type_f2c(*sendtype);
8283
c_recvtype = PMPI_Type_f2c(*recvtype);
8384

84-
sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
8585
sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
86+
recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
8687
recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
8788

8889
c_ierr = PMPI_Iscatter(sendbuf,OMPI_FINT_2_INT(*sendcount),

ompi/mpi/fortran/mpif-h/iscatterv_f.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2015 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
15+
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -88,8 +89,8 @@ void ompi_iscatterv_f(char *sendbuf, MPI_Fint *sendcounts,
8889
OMPI_ARRAY_FINT_2_INT(sendcounts, size);
8990
OMPI_ARRAY_FINT_2_INT(displs, size);
9091

91-
sendbuf = (char *) OMPI_F2C_IN_PLACE(sendbuf);
9292
sendbuf = (char *) OMPI_F2C_BOTTOM(sendbuf);
93+
recvbuf = (char *) OMPI_F2C_IN_PLACE(recvbuf);
9394
recvbuf = (char *) OMPI_F2C_BOTTOM(recvbuf);
9495

9596
c_ierr = PMPI_Iscatterv(sendbuf,

0 commit comments

Comments
 (0)