Skip to content

Commit 7cae36f

Browse files
committed
ompi: accept MPI_IN_PLACE in MPI_Ialltoall*
1 parent 1e0f591 commit 7cae36f

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

ompi/mpi/c/ialltoall.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2012 Oak Ridge National Laboratory. All rights reserved.
1515
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2014-2015 Research Organization for Information Science
17+
* Copyright (c) 2014-2016 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* $COPYRIGHT$
2020
*
@@ -74,11 +74,6 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
7474
MPI_IN_PLACE == recvbuf) {
7575
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
7676
FUNC_NAME);
77-
} else if (MPI_IN_PLACE == sendbuf) {
78-
/* MPI_IN_PLACE is not fully implemented yet,
79-
return MPI_ERR_INTERN for now */
80-
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN,
81-
FUNC_NAME);
8277
} else {
8378
if (MPI_IN_PLACE != sendbuf) {
8479
OMPI_CHECK_DATATYPE_FOR_SEND(err, sendtype, sendcount);

ompi/mpi/c/ialltoallv.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2016 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
1919
*
@@ -100,11 +100,6 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl
100100
(MPI_IN_PLACE == sendbuf && OMPI_COMM_IS_INTER(comm)) ||
101101
MPI_IN_PLACE == recvbuf) {
102102
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
103-
} else if (MPI_IN_PLACE == sendbuf) {
104-
/* MPI_IN_PLACE is not fully implemented yet,
105-
return MPI_ERR_INTERN for now */
106-
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN,
107-
FUNC_NAME);
108103
}
109104

110105
size = OMPI_COMM_IS_INTER(comm)?ompi_comm_remote_size(comm):ompi_comm_size(comm);

ompi/mpi/c/ialltoallw.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014-2015 Research Organization for Information Science
16+
* Copyright (c) 2014-2016 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
1919
*
@@ -96,11 +96,6 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl
9696
(MPI_IN_PLACE == sendbuf && OMPI_COMM_IS_INTER(comm)) ||
9797
MPI_IN_PLACE == recvbuf) {
9898
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
99-
} else if (MPI_IN_PLACE == sendbuf) {
100-
/* MPI_IN_PLACE is not fully implemented yet,
101-
return MPI_ERR_INTERN for now */
102-
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN,
103-
FUNC_NAME);
10499
}
105100

106101
size = OMPI_COMM_IS_INTER(comm)?ompi_comm_remote_size(comm):ompi_comm_size(comm);

0 commit comments

Comments
 (0)