X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b512c05a92b5f7e29bd6cf767e1de5b40344aa61..7a99910faad9adbbc01f4e4cccb504a53bed1af6:/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 cc86aec60f..09324ed52b 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -15,11 +15,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); /* PMPI User level calls */ -int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) -{ - return PMPI_Ibcast(buf, count, datatype, root, comm, MPI_REQUEST_IGNORED); -} - int PMPI_Barrier(MPI_Comm comm) { return PMPI_Ibarrier(comm, MPI_REQUEST_IGNORED); @@ -48,18 +43,28 @@ int PMPI_Ibarrier(MPI_Comm comm, MPI_Request *request) return retval; } +int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) +{ + return PMPI_Ibcast(buf, count, datatype, root, comm, MPI_REQUEST_IGNORED); +} + int PMPI_Ibcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request* request) { - int retval = 0; - smpi_bench_end(); if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (not datatype->is_valid()) { - retval = MPI_ERR_ARG; - } else if(request == nullptr){ - retval = MPI_ERR_ARG; + return MPI_ERR_COMM; + } if (buf == nullptr && count > 0) { + return MPI_ERR_BUFFER; + } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()) { + return MPI_ERR_TYPE; + } else if (count < 0){ + return MPI_ERR_COUNT; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; + } else if (request == nullptr){ + return MPI_ERR_ARG; } else { + smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED?"PMPI_Bcast":"PMPI_Ibcast", new simgrid::instr::CollTIData(request==MPI_REQUEST_IGNORED?"bcast":"ibcast", root, -1.0, @@ -74,12 +79,10 @@ int PMPI_Ibcast(void *buf, int count, MPI_Datatype datatype, if(request!=MPI_REQUEST_IGNORED) *request = MPI_REQUEST_NULL; } - retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - smpi_bench_begin(); - return retval; } int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype, @@ -90,21 +93,21 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu int PMPI_Igather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || + return MPI_ERR_COMM; + } else if ((sendbuf == nullptr) || ((comm->rank() == root) && recvbuf == nullptr)) { + return MPI_ERR_BUFFER; + } else if (((sendbuf != MPI_IN_PLACE && sendcount > 0) && (sendtype == MPI_DATATYPE_NULL)) || ((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL))){ - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || ((comm->rank() == root) && (recvcount <0))){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; } else if (request == nullptr){ - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - + smpi_bench_end(); char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; @@ -125,12 +128,10 @@ int PMPI_Igather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvb else simgrid::smpi::Colls::igather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm, request); - retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, @@ -141,22 +142,28 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv int PMPI_Igatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; + } else if ((sendbuf == nullptr && sendcount > 0) || ((comm->rank() == root) && recvbuf == nullptr)) { + return MPI_ERR_BUFFER; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || ((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL))){ - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else if ((comm->rank() == root) && (recvcounts == nullptr || displs == nullptr)) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; } else if (request == nullptr){ - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { + for (int i = 0; i < comm->size(); i++){ + if((comm->rank() == root) && (recvcounts[i]<0)) + return MPI_ERR_COUNT; + } + + smpi_bench_end(); char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; @@ -181,14 +188,13 @@ int PMPI_Igatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *rec dt_size_recv, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); if(request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); + simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); else - retval = simgrid::smpi::Colls::igatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm, request); + simgrid::smpi::Colls::igatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm, request); TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, @@ -205,6 +211,8 @@ int PMPI_Iallgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; + } else if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr)){ + retval = MPI_ERR_BUFFER; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL)){ retval = MPI_ERR_TYPE; @@ -244,22 +252,25 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int PMPI_Iallgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; + } else if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr)){ + return MPI_ERR_BUFFER; } else if (((sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || (recvtype == MPI_DATATYPE_NULL)) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else if (recvcounts == nullptr || displs == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else if (request == nullptr){ - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { + for (int i = 0; i < comm->size(); i++){ // copy data to avoid bad free + if (recvcounts[i] < 0) + return MPI_ERR_COUNT; + } + smpi_bench_end(); if(sendbuf == MPI_IN_PLACE) { sendbuf=static_cast(recvbuf)+recvtype->get_extent()*displs[comm->rank()]; sendcount=recvcounts[comm->rank()]; @@ -269,8 +280,9 @@ int PMPI_Iallgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); std::vector* trace_recvcounts = new std::vector; - for (int i = 0; i < comm->size(); i++) // copy data to avoid bad free + for (int i = 0; i < comm->size(); i++){ // copy data to avoid bad free trace_recvcounts->push_back(recvcounts[i] * dt_size_recv); + } TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED?"PMPI_Allgatherv":"PMPI_Iallgatherv", new simgrid::instr::VarCollTIData( @@ -281,12 +293,10 @@ int PMPI_Iallgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); else simgrid::smpi::Colls::iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request); - retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, @@ -297,20 +307,24 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, int PMPI_Iscatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (((comm->rank() == root) && (not sendtype->is_valid())) || - ((recvbuf != MPI_IN_PLACE) && (not recvtype->is_valid()))) { - retval = MPI_ERR_TYPE; + return MPI_ERR_COMM; + } else if (((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL || not sendtype->is_valid())) || + ((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL || not recvtype->is_valid()))) { + return MPI_ERR_TYPE; + } else if (((comm->rank() == root) && (sendcount < 0)) || + ((recvbuf != MPI_IN_PLACE) && (recvcount < 0))) { + return MPI_ERR_COUNT; } else if ((sendbuf == recvbuf) || - ((comm->rank()==root) && sendcount>0 && (sendbuf == nullptr))){ - retval = MPI_ERR_BUFFER; - }else { - + ((comm->rank()==root) && sendcount>0 && (sendbuf == nullptr)) || + (recvcount > 0 && recvbuf == nullptr)){ + return MPI_ERR_BUFFER; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; + } else if (request == nullptr){ + return MPI_ERR_ARG; + } else { + smpi_bench_end(); if (recvbuf == MPI_IN_PLACE) { recvtype = sendtype; recvcount = sendcount; @@ -328,12 +342,10 @@ int PMPI_Iscatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); else simgrid::smpi::Colls::iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm, request); - retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, @@ -344,31 +356,40 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, int PMPI_Iscatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (sendcounts == nullptr || displs == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else if (((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL)) || ((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (request == nullptr){ - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; + } else if (recvbuf != MPI_IN_PLACE && recvcount < 0){ + return MPI_ERR_COUNT; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; } else { - if (recvbuf == MPI_IN_PLACE) { + if (comm->rank() == root){ + if(recvbuf == MPI_IN_PLACE) { recvtype = sendtype; recvcount = sendcounts[comm->rank()]; + } + for (int i = 0; i < comm->size(); i++){ + if(sendcounts[i]<0) + return MPI_ERR_COUNT; + } } + smpi_bench_end(); + int rank = simgrid::s4u::this_actor::get_pid(); int dt_size_send = sendtype->is_replayable() ? 1 : sendtype->size(); std::vector* trace_sendcounts = new std::vector; if (comm->rank() == root) { - for (int i = 0; i < comm->size(); i++) // copy data to avoid bad free + for (int i = 0; i < comm->size(); i++){ // copy data to avoid bad free trace_sendcounts->push_back(sendcounts[i] * dt_size_send); + } } TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED?"PMPI_Scatterv":"PMPI_Iscatterv", @@ -377,15 +398,14 @@ int PMPI_Iscatterv(void *sendbuf, int *sendcounts, int *displs, recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), nullptr, simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); if(request == MPI_REQUEST_IGNORED) - retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); + simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); else - retval = simgrid::smpi::Colls::iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request); - + simgrid::smpi::Colls::iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request); TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - smpi_bench_begin(); - return retval; } int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) @@ -395,15 +415,22 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, int PMPI_Ireduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request* request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (not datatype->is_valid() || op == MPI_OP_NULL) { - retval = MPI_ERR_ARG; + return MPI_ERR_COMM; + } else if ((sendbuf == nullptr && count > 0) || ((comm->rank() == root) && recvbuf == nullptr)) { + return MPI_ERR_BUFFER; + } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()){ + return MPI_ERR_TYPE; + } else if (op == MPI_OP_NULL) { + return MPI_ERR_OP; + } else if (request == nullptr){ + return MPI_ERR_ARG; + } else if (root < 0 || root >= comm->size()){ + return MPI_ERR_ROOT; + } else if (count < 0){ + return MPI_ERR_COUNT; } else { + smpi_bench_end(); int rank = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ? "PMPI_Reduce":"PMPI_Ireduce", @@ -415,22 +442,23 @@ int PMPI_Ireduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, else simgrid::smpi::Colls::ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, request); - - retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op){ int retval = 0; smpi_bench_end(); - if (not datatype->is_valid() || op == MPI_OP_NULL) { - retval = MPI_ERR_ARG; - } else { + if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()){ + retval = MPI_ERR_TYPE; + } else if (op == MPI_OP_NULL) { + retval = MPI_ERR_OP; + } else if (count < 0){ + retval = MPI_ERR_COUNT; + } else { op->apply(inbuf, inoutbuf, &count, datatype); retval = MPI_SUCCESS; } @@ -445,17 +473,20 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) { - int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (not datatype->is_valid()) { - retval = MPI_ERR_TYPE; + return MPI_ERR_COMM; + } else if ((sendbuf == nullptr && count > 0) || (recvbuf == nullptr)) { + return MPI_ERR_BUFFER; + } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()) { + return MPI_ERR_TYPE; + } else if (count < 0){ + return MPI_ERR_COUNT; } else if (op == MPI_OP_NULL) { - retval = MPI_ERR_OP; + return MPI_ERR_OP; + } else if (request == nullptr){ + return MPI_ERR_ARG; } else { + smpi_bench_end(); char* sendtmpbuf = static_cast(sendbuf); if( sendbuf == MPI_IN_PLACE ) { sendtmpbuf = static_cast(xbt_malloc(count*datatype->get_extent())); @@ -463,7 +494,7 @@ int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty } int rank = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_comm_in(rank, __func__, + TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ?"PMPI_Allreduce":"PMPI_Iallreduce", new simgrid::instr::CollTIData(request==MPI_REQUEST_IGNORED ? "allreduce":"iallreduce", -1, 0, datatype->is_replayable() ? count : count * datatype->size(), -1, simgrid::smpi::Datatype::encode(datatype), "")); @@ -476,15 +507,18 @@ int PMPI_Iallreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty if( sendbuf == MPI_IN_PLACE ) xbt_free(sendtmpbuf); - retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); + smpi_bench_begin(); + return MPI_SUCCESS; } - - smpi_bench_begin(); - return retval; } int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return PMPI_Iscan(sendbuf, recvbuf, count, datatype, op, comm, MPI_REQUEST_IGNORED); +} + +int PMPI_Iscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request) { int retval = 0; @@ -492,10 +526,14 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (not datatype->is_valid()) { + } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()){ retval = MPI_ERR_TYPE; } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; + } else if (request == nullptr){ + retval = MPI_ERR_ARG; + } else if (count < 0){ + retval = MPI_ERR_COUNT; } else { int rank = simgrid::s4u::this_actor::get_pid(); void* sendtmpbuf = sendbuf; @@ -503,11 +541,15 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); memcpy(sendtmpbuf, recvbuf, count * datatype->size()); } - TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::Pt2PtTIData( - "scan", -1, datatype->is_replayable() ? count : count * datatype->size(), + TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ? "PMPI_Scan" : "PMPI_Iscan", new simgrid::instr::Pt2PtTIData( + request==MPI_REQUEST_IGNORED ? "scan":"iscan", -1, + datatype->is_replayable() ? count : count * datatype->size(), simgrid::smpi::Datatype::encode(datatype))); - retval = simgrid::smpi::Colls::scan(sendtmpbuf, recvbuf, count, datatype, op, comm); + if(request == MPI_REQUEST_IGNORED) + retval = simgrid::smpi::Colls::scan(sendtmpbuf, recvbuf, count, datatype, op, comm); + else + retval = simgrid::smpi::Colls::iscan(sendtmpbuf, recvbuf, count, datatype, op, comm, request); TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) @@ -518,7 +560,12 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP return retval; } -int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm){ +int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return PMPI_Iexscan(sendbuf, recvbuf, count, datatype, op, comm, MPI_REQUEST_IGNORED); +} + +int PMPI_Iexscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request* request){ int retval = 0; smpi_bench_end(); @@ -529,6 +576,10 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, retval = MPI_ERR_TYPE; } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; + } else if (request == nullptr){ + retval = MPI_ERR_ARG; + } else if (count < 0){ + retval = MPI_ERR_COUNT; } else { int rank = simgrid::s4u::this_actor::get_pid(); void* sendtmpbuf = sendbuf; @@ -537,11 +588,14 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, memcpy(sendtmpbuf, recvbuf, count * datatype->size()); } - TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::Pt2PtTIData( - "exscan", -1, datatype->is_replayable() ? count : count * datatype->size(), + TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ? "PMPI_Exscan" : "PMPI_Iexscan", new simgrid::instr::Pt2PtTIData( + request==MPI_REQUEST_IGNORED ? "exscan":"iexscan", -1, datatype->is_replayable() ? count : count * datatype->size(), simgrid::smpi::Datatype::encode(datatype))); - retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); + if(request == MPI_REQUEST_IGNORED) + retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); + else + retval = simgrid::smpi::Colls::iexscan(sendtmpbuf, recvbuf, count, datatype, op, comm, request); TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) @@ -553,19 +607,33 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return PMPI_Ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, MPI_REQUEST_IGNORED); +} + +int PMPI_Ireduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) { int retval = 0; - smpi_bench_end(); if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (not datatype->is_valid()) { + } else if ((sendbuf == nullptr) || (recvbuf == nullptr)) { + retval = MPI_ERR_BUFFER; + } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()){ retval = MPI_ERR_TYPE; } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; + } else if (request == nullptr){ + retval = MPI_ERR_ARG; } else { + for (int i = 0; i < comm->size(); i++) { // copy data to avoid bad free + if(recvcounts[i]<0) + return MPI_ERR_COUNT; + } + smpi_bench_end(); + int rank = simgrid::s4u::this_actor::get_pid(); std::vector* trace_recvcounts = new std::vector; int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); @@ -582,24 +650,34 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat memcpy(sendtmpbuf, recvbuf, totalcount * datatype->size()); } - TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::VarCollTIData( - "reducescatter", -1, dt_send_size, nullptr, -1, trace_recvcounts, + TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter": "PMPI_Ireduce_scatter", new simgrid::instr::VarCollTIData( + request==MPI_REQUEST_IGNORED ? "reducescatter":"ireducescatter", -1, dt_send_size, nullptr, -1, trace_recvcounts, simgrid::smpi::Datatype::encode(datatype), "")); - simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + if(request == MPI_REQUEST_IGNORED) + simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + else + simgrid::smpi::Colls::ireduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm, request); + retval = MPI_SUCCESS; TRACE_smpi_comm_out(rank); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); + smpi_bench_begin(); } - smpi_bench_begin(); return retval; } int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return PMPI_Ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, MPI_REQUEST_IGNORED); +} + +int PMPI_Ireduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) { int retval; smpi_bench_end(); @@ -612,7 +690,9 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, retval = MPI_ERR_OP; } else if (recvcount < 0) { retval = MPI_ERR_ARG; - } else { + } else if (request == nullptr){ + retval = MPI_ERR_ARG; + } else { int count = comm->size(); int rank = simgrid::s4u::this_actor::get_pid(); @@ -625,14 +705,17 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size()); } - TRACE_smpi_comm_in(rank, __func__, - new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, -1, trace_recvcounts, + TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED ? "PMPI_Reduce_scatter_block":"PMPI_Ireduce_scatter_block", + new simgrid::instr::VarCollTIData(request==MPI_REQUEST_IGNORED ? "reducescatter":"ireducescatter", -1, 0, nullptr, -1, trace_recvcounts, simgrid::smpi::Datatype::encode(datatype), "")); int* recvcounts = new int[count]; for (int i = 0; i < count; i++) recvcounts[i] = recvcount; - simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + if(request == MPI_REQUEST_IGNORED) + simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + else + simgrid::smpi::Colls::ireduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm, request); delete[] recvcounts; retval = MPI_SUCCESS; @@ -658,8 +741,12 @@ int PMPI_Ialltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* re if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; + } else if ((sendbuf == nullptr && sendcount > 0) || (recvbuf == nullptr && recvcount > 0)) { + retval = MPI_ERR_BUFFER; } else if ((sendbuf != MPI_IN_PLACE && sendtype == MPI_DATATYPE_NULL) || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; + } else if ((sendbuf != MPI_IN_PLACE && sendcount < 0) || recvcount < 0){ + retval = MPI_ERR_COUNT; } else if (request == nullptr){ retval = MPI_ERR_ARG; } else { @@ -705,11 +792,10 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype int* recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; + } else if (sendbuf == nullptr || recvbuf == nullptr) { + retval = MPI_ERR_BUFFER; } else if ((sendbuf != MPI_IN_PLACE && sendtype == MPI_DATATYPE_NULL) || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if ((sendbuf != MPI_IN_PLACE && (sendcounts == nullptr || senddisps == nullptr)) || recvcounts == nullptr || @@ -720,6 +806,11 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype } else { int rank = simgrid::s4u::this_actor::get_pid(); int size = comm->size(); + for (int i = 0; i < size; i++) { + if (recvcounts[i] <0 || (sendbuf != MPI_IN_PLACE && sendcounts[i]<0)) + return MPI_ERR_COUNT; + } + smpi_bench_end(); int send_size = 0; int recv_size = 0; std::vector* trace_sendcounts = new std::vector; @@ -757,7 +848,7 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype TRACE_smpi_comm_in(rank, request==MPI_REQUEST_IGNORED?"PMPI_Alltoallv":"PMPI_Ialltoallv", new simgrid::instr::VarCollTIData(request==MPI_REQUEST_IGNORED ? "alltoallv":"ialltoallv", -1, send_size, trace_sendcounts, recv_size, - trace_recvcounts, simgrid::smpi::Datatype::encode(sendtype), + trace_recvcounts, simgrid::smpi::Datatype::encode(sendtmptype), simgrid::smpi::Datatype::encode(recvtype))); if(request == MPI_REQUEST_IGNORED) @@ -773,9 +864,8 @@ int PMPI_Ialltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype xbt_free(sendtmpcounts); xbt_free(sendtmpdisps); } + smpi_bench_begin(); } - - smpi_bench_begin(); return retval; } @@ -789,11 +879,10 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype int* recvcounts, int* recvdisps, MPI_Datatype* recvtypes, MPI_Comm comm, MPI_Request *request) { int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; + } else if (sendbuf == nullptr || recvbuf == nullptr) { + retval = MPI_ERR_BUFFER; } else if ((sendbuf != MPI_IN_PLACE && sendtypes == nullptr) || recvtypes == nullptr) { retval = MPI_ERR_TYPE; } else if ((sendbuf != MPI_IN_PLACE && (sendcounts == nullptr || senddisps == nullptr)) || recvcounts == nullptr || @@ -802,8 +891,13 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype } else if (request == nullptr){ retval = MPI_ERR_ARG; } else { + 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 + if (recvcounts[i] <0 || (sendbuf != MPI_IN_PLACE && sendcounts[i]<0)) + return MPI_ERR_COUNT; + } int send_size = 0; int recv_size = 0; std::vector* trace_sendcounts = new std::vector; @@ -861,8 +955,7 @@ int PMPI_Ialltoallw(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype xbt_free(sendtmpdisps); xbt_free(sendtmptypes); } + smpi_bench_begin(); } - - smpi_bench_begin(); return retval; }