A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into disk
[simgrid.git]
/
src
/
smpi
/
bindings
/
smpi_pmpi_coll.cpp
diff --git
a/src/smpi/bindings/smpi_pmpi_coll.cpp
b/src/smpi/bindings/smpi_pmpi_coll.cpp
index
fc591d6
..
b487d2b
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi_coll.cpp
+++ b/
src/smpi/bindings/smpi_pmpi_coll.cpp
@@
-101,7
+101,7
@@
int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void
{
if (comm == MPI_COMM_NULL)
return MPI_ERR_COMM;
- if ((sendbuf == nullptr
) || ((comm->rank() == root) && recvbuf == nullptr
))
+ if ((sendbuf == nullptr
&& sendcount > 0) || ((comm->rank() == root) && recvbuf == nullptr && recvcount > 0
))
return MPI_ERR_BUFFER;
if (((sendbuf != MPI_IN_PLACE && sendcount > 0) && (sendtype == MPI_DATATYPE_NULL)) ||
((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL)))
@@
-213,16
+213,17
@@
int PMPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int PMPI_Iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount,
MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request)
{
- if (comm == MPI_COMM_NULL)
- return MPI_ERR_COMM;
- if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr))
- return MPI_ERR_BUFFER;
- if (((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL))
- return MPI_ERR_TYPE;
- if (((sendbuf != MPI_IN_PLACE) && (sendcount < 0)) || (recvcount < 0))
- return MPI_ERR_COUNT;
- if (request == nullptr)
- return MPI_ERR_ARG;
+ CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, "Iallgather: the communicator cannot be MPI_COMM_NULL");
+ CHECK_ARGS(recvbuf == nullptr && recvcount > 0, MPI_ERR_BUFFER, "Iallgather: param 4 recvbuf cannot be NULL");
+ CHECK_ARGS(sendbuf == nullptr && sendcount > 0, MPI_ERR_BUFFER,
+ "Iallgather: param 1 sendbuf cannot be NULL when sendcound > 0");
+ CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE,
+ "Iallgather: param 3 sendtype cannot be MPI_DATATYPE_NULL when sendbuff is not MPI_IN_PLACE");
+ CHECK_ARGS(recvtype == MPI_DATATYPE_NULL, MPI_ERR_TYPE, "Iallgather: param 6 recvtype cannot be MPI_DATATYPE_NULL");
+ CHECK_ARGS(recvcount < 0, MPI_ERR_COUNT, "Iallgather: param 5 recvcount cannot be negative");
+ CHECK_ARGS((sendbuf != MPI_IN_PLACE) && (sendcount < 0), MPI_ERR_COUNT,
+ "Iallgather: param 2 sendcount cannot be negative when sendbuf is not MPI_IN_PLACE");
+ CHECK_ARGS(request == nullptr, MPI_ERR_ARG, "Iallgather: param 8 request cannot be NULL");
smpi_bench_end();
if (sendbuf == MPI_IN_PLACE) {
@@
-258,7
+259,7
@@
int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype,
{
if (comm == MPI_COMM_NULL)
return MPI_ERR_COMM;
- if (
(sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr)
)
+ if (
sendbuf == nullptr && sendcount > 0
)
return MPI_ERR_BUFFER;
if (((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL))
return MPI_ERR_TYPE;
@@
-269,9
+270,11
@@
int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype,
if (request == nullptr)
return MPI_ERR_ARG;
- for (int i = 0; i < comm->size(); i++) {
// copy data to avoid bad free
+ for (int i = 0; i < comm->size(); i++) {
if (recvcounts[i] < 0)
return MPI_ERR_COUNT;
+ else if (recvcounts[i] > 0 && recvbuf == nullptr)
+ return MPI_ERR_BUFFER;
}
smpi_bench_end();
@@
-360,8
+363,10
@@
int PMPI_Iscatterv(const void* sendbuf, const int* sendcounts, const int* displs
MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request)
{
CHECK_ARGS(comm == MPI_COMM_NULL, MPI_ERR_COMM, "Iscatterv: the communicator cannot be MPI_COMM_NULL");
- CHECK_ARGS(sendcounts == nullptr, MPI_ERR_ARG, "Iscatterv: param 2 sendcounts cannot be NULL");
- CHECK_ARGS(displs == nullptr, MPI_ERR_ARG, "Iscatterv: param 3 displs cannot be NULL");
+ CHECK_ARGS((comm->rank() == root) && (sendcounts == nullptr), MPI_ERR_ARG,
+ "Iscatterv: param 2 sendcounts cannot be NULL on the root rank");
+ CHECK_ARGS((comm->rank() == root) && (displs == nullptr), MPI_ERR_ARG,
+ "Iscatterv: param 3 displs cannot be NULL on the root rank");
CHECK_ARGS((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE,
"Iscatterv: The sendtype cannot be NULL on the root rank");
CHECK_ARGS((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL), MPI_ERR_TYPE,
@@
-876,7
+881,7
@@
int PMPI_Ialltoallw(const void* sendbuf, const int* sendcounts, const int* sendd
smpi_bench_end();
int rank = simgrid::s4u::this_actor::get_pid();
int size = comm->size();
- for (int i = 0; i < size; i++) {
// copy data to avoid bad free
+ for (int i = 0; i < size; i++) {
if (recvcounts[i] < 0 || (sendbuf != MPI_IN_PLACE && sendcounts[i] < 0))
return MPI_ERR_COUNT;
}