* under the terms of the license (GNU LGPL) which comes with this package. */
#include <simgrid/s4u/host.hpp>
-#include <xbt/ex.hpp>
#include "private.h"
-#include "smpi_mpi_dt_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)");
int already_init;
MPI_Initialized(&already_init);
if(already_init == 0){
- smpi_process_init(argc, argv);
- smpi_process_mark_as_initialized();
- int rank = smpi_process_index();
+ Process::init(argc, argv);
+ smpi_process()->mark_as_initialized();
+ int rank = smpi_process()->index();
TRACE_smpi_init(rank);
TRACE_smpi_computing_init(rank);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
int PMPI_Finalize()
{
smpi_bench_end();
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_FINALIZE;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- smpi_process_finalize();
+ smpi_process()->finalize();
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
- TRACE_smpi_finalize(smpi_process_index());
- smpi_process_destroy();
+ TRACE_smpi_finalize(smpi_process()->index());
+ smpi_process()->destroy();
return MPI_SUCCESS;
}
int PMPI_Finalized(int* flag)
{
- *flag=smpi_process_finalized();
+ *flag=smpi_process()!=nullptr ? smpi_process()->finalized() : 0;
return MPI_SUCCESS;
}
if (flag == nullptr) {
return MPI_ERR_ARG;
} else {
- *flag = smpi_process_index() == 0;
+ *flag = smpi_process()->index() == 0;
return MPI_SUCCESS;
}
}
int PMPI_Abort(MPI_Comm comm, int errorcode)
{
smpi_bench_end();
- smpi_process_destroy();
+ smpi_process()->destroy();
// FIXME: should kill all processes in comm instead
simcall_process_kill(SIMIX_process_self());
return MPI_SUCCESS;
if (*datatype == MPI_DATATYPE_NULL) {
return MPI_ERR_ARG;
} else {
- smpi_datatype_unuse(*datatype);
+ Datatype::unref(*datatype);
return MPI_SUCCESS;
}
}
} else if (size == nullptr) {
return MPI_ERR_ARG;
} else {
- *size = static_cast<int>(smpi_datatype_size(datatype));
+ *size = static_cast<int>(datatype->size());
return MPI_SUCCESS;
}
}
} else if (size == nullptr) {
return MPI_ERR_ARG;
} else {
- *size = static_cast<MPI_Count>(smpi_datatype_size(datatype));
+ *size = static_cast<MPI_Count>(datatype->size());
return MPI_SUCCESS;
}
}
} else if (lb == nullptr || extent == nullptr) {
return MPI_ERR_ARG;
} else {
- return smpi_datatype_extent(datatype, lb, extent);
+ return datatype->extent(lb, extent);
}
}
} else if (extent == nullptr) {
return MPI_ERR_ARG;
} else {
- *extent = smpi_datatype_get_extent(datatype);
+ *extent = datatype->get_extent();
return MPI_SUCCESS;
}
}
} else if (disp == nullptr) {
return MPI_ERR_ARG;
} else {
- *disp = smpi_datatype_lb(datatype);
+ *disp = datatype->lb();
return MPI_SUCCESS;
}
}
} else if (disp == nullptr) {
return MPI_ERR_ARG;
} else {
- *disp = smpi_datatype_ub(datatype);
+ *disp = datatype->ub();
return MPI_SUCCESS;
}
}
int PMPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype){
+ int retval = MPI_SUCCESS;
if (datatype == MPI_DATATYPE_NULL) {
- return MPI_ERR_TYPE;
+ retval=MPI_ERR_TYPE;
} else {
- return smpi_datatype_dup(datatype, newtype);
+ *newtype = new Datatype(datatype, &retval);
+ //error when duplicating, free the new datatype
+ if(retval!=MPI_SUCCESS){
+ Datatype::unref(*newtype);
+ *newtype = MPI_DATATYPE_NULL;
+ }
}
+ return retval;
}
int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op)
if (group == nullptr) {
return MPI_ERR_ARG;
} else {
- (*group)->destroy();
+ if(*group != MPI_COMM_WORLD->group() && *group != MPI_GROUP_EMPTY)
+ Group::unref(*group);
*group = MPI_GROUP_NULL;
return MPI_SUCCESS;
}
} else if (rank == nullptr) {
return MPI_ERR_ARG;
} else {
- *rank = group->rank(smpi_process_index());
+ *rank = group->rank(smpi_process()->index());
return MPI_SUCCESS;
}
}
*newgroup = group;
if (group != MPI_COMM_WORLD->group()
&& group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY)
- group->use();
+ group->ref();
return MPI_SUCCESS;
} else if (n == group->size()) {
*newgroup = MPI_GROUP_EMPTY;
*newgroup = group;
if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() &&
group != MPI_GROUP_EMPTY)
- group->use();
+ group->ref();
return MPI_SUCCESS;
} else {
return group->range_excl(n,ranges,newgroup);
} else {
*group = comm->group();
if (*group != MPI_COMM_WORLD->group() && *group != MPI_GROUP_NULL && *group != MPI_GROUP_EMPTY)
- (*group)->use();
+ (*group)->ref();
return MPI_SUCCESS;
}
}
return MPI_ERR_GROUP;
} else if (newcomm == nullptr) {
return MPI_ERR_ARG;
- } else if(group->rank(smpi_process_index())==MPI_UNDEFINED){
+ } else if(group->rank(smpi_process()->index())==MPI_UNDEFINED){
*newcomm= MPI_COMM_NULL;
return MPI_SUCCESS;
}else{
- group->use();
+ group->ref();
*newcomm = new Comm(group, nullptr);
return MPI_SUCCESS;
}
} else if (*comm == MPI_COMM_NULL) {
return MPI_ERR_COMM;
} else {
- (*comm)->destroy();
+ Comm::destroy(*comm);
*comm = MPI_COMM_NULL;
return MPI_SUCCESS;
}
} else if (*comm == MPI_COMM_NULL) {
return MPI_ERR_COMM;
} else {
- (*comm)->destroy();
+ Comm::destroy(*comm);
*comm = MPI_COMM_NULL;
return MPI_SUCCESS;
}
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (dst == MPI_PROC_NULL) {
retval = MPI_SUCCESS;
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (src == MPI_PROC_NULL) {
retval = MPI_SUCCESS;
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (dst == MPI_PROC_NULL) {
retval = MPI_SUCCESS;
if (*request == MPI_REQUEST_NULL) {
retval = MPI_ERR_ARG;
} else {
- Request::unuse(request);
+ Request::unref(request);
retval = MPI_SUCCESS;
}
smpi_bench_begin();
retval = MPI_ERR_RANK;
} else if ((count < 0) || (buf==nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if(tag<0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int src_traced = comm->group()->index(src);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if(known==0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count*dt_size_send;
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
retval = MPI_ERR_RANK;
} else if ((count < 0) || (buf==nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if(tag<0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int dst_traced = comm->group()->index(dst);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_ISEND;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if(known==0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count*dt_size_send;
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
- TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype));
+ TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size());
*request = Request::isend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
retval = MPI_ERR_RANK;
} else if ((count < 0)|| (buf==nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if(tag<0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int dst_traced = comm->group()->index(dst);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_ISSEND;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if(known==0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count*dt_size_send;
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
- TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype));
+ TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size());
*request = Request::issend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
} else if (src == MPI_PROC_NULL) {
- smpi_empty_status(status);
+ Status::empty(status);
status->MPI_SOURCE = MPI_PROC_NULL;
retval = MPI_SUCCESS;
} else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){
retval = MPI_ERR_RANK;
} else if ((count < 0) || (buf==nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if(tag<0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int src_traced = comm->group()->index(src);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_RECV;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
retval = MPI_ERR_RANK;
} else if ((count < 0) || (buf == nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if(tag < 0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int dst_traced = comm->group()->index(dst);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_SEND;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0) {
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
}
extra->send_size = count*dt_size_send;
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
if (!TRACE_smpi_view_internals()) {
- TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype));
+ TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size());
}
Request::send(buf, count, datatype, dst, tag, comm);
retval = MPI_ERR_RANK;
} else if ((count < 0) || (buf==nullptr && count > 0)) {
retval = MPI_ERR_COUNT;
- } else if (!is_datatype_valid(datatype)){
+ } else if (!datatype->is_valid()){
retval = MPI_ERR_TYPE;
} else if(tag<0 && tag != MPI_ANY_TAG){
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int dst_traced = comm->group()->index(dst);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_SSEND;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if(known == 0) {
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
}
extra->send_size = count*dt_size_send;
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
- TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype));
+ TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size());
Request::ssend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(sendtype) || !is_datatype_valid(recvtype)) {
+ } else if (!sendtype->is_valid() || !recvtype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (src == MPI_PROC_NULL || dst == MPI_PROC_NULL) {
- smpi_empty_status(status);
+ Status::empty(status);
status->MPI_SOURCE = MPI_PROC_NULL;
retval = MPI_SUCCESS;
}else if (dst >= comm->group()->size() || dst <0 ||
retval = MPI_ERR_TAG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int dst_traced = comm->group()->index(dst);
int src_traced = comm->group()->index(src);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->datatype1 = encode_datatype(sendtype, &known);
int dt_size_send = 1;
if(known==0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
extra->send_size = sendcount*dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if(known==0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recv_size = recvcount*dt_size_recv;
TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, extra);
- TRACE_smpi_send(rank, rank, dst_traced, sendtag,sendcount*smpi_datatype_size(sendtype));
+ TRACE_smpi_send(rank, rank, dst_traced, sendtag,sendcount*sendtype->size());
Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm,
status);
MPI_Comm comm, MPI_Status* status)
{
int retval = 0;
- if (!is_datatype_valid(datatype)) {
+ if (!datatype->is_valid()) {
return MPI_ERR_TYPE;
} else if (count < 0) {
return MPI_ERR_COUNT;
} else {
- int size = smpi_datatype_get_extent(datatype) * count;
+ int size = datatype->get_extent() * count;
void* recvbuf = xbt_new0(char, size);
retval = MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, datatype, src, recvtag, comm, status);
if(retval==MPI_SUCCESS){
- smpi_datatype_copy(recvbuf, count, datatype, buf, count, datatype);
+ Datatype::copy(recvbuf, count, datatype, buf, count, datatype);
}
xbt_free(recvbuf);
retval = MPI_ERR_ARG;
} else if (*request == MPI_REQUEST_NULL) {
*flag= true;
- smpi_empty_status(status);
+ Status::empty(status);
retval = MPI_SUCCESS;
} else {
- int rank = ((*request)->comm() != MPI_COMM_NULL) ? smpi_process_index() : -1;
+ int rank = ((*request)->comm() != MPI_COMM_NULL) ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_TEST;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
} else if (source == MPI_PROC_NULL) {
- smpi_empty_status(status);
+ Status::empty(status);
status->MPI_SOURCE = MPI_PROC_NULL;
retval = MPI_SUCCESS;
} else {
retval = MPI_ERR_COMM;
} else if (source == MPI_PROC_NULL) {
*flag=true;
- smpi_empty_status(status);
+ Status::empty(status);
status->MPI_SOURCE = MPI_PROC_NULL;
retval = MPI_SUCCESS;
} else {
smpi_bench_end();
- smpi_empty_status(status);
+ Status::empty(status);
if (request == nullptr) {
retval = MPI_ERR_ARG;
retval = MPI_SUCCESS;
} else {
- int rank = (request!=nullptr && (*request)->comm() != MPI_COMM_NULL) ? smpi_process_index() : -1;
+ int rank = (request!=nullptr && (*request)->comm() != MPI_COMM_NULL) ? smpi_process()->index() : -1;
int src_traced = (*request)->src();
int dst_traced = (*request)->dst();
savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), req->comm()};
}
}
- int rank_traced = smpi_process_index();
+ int rank_traced = smpi_process()->index();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_WAITANY;
extra->send_size=count;
savedvals[i].valid=0;
}
}
- int rank_traced = smpi_process_index();
+ int rank_traced = smpi_process()->index();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_WAITALL;
extra->send_size=count;
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_ARG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
if (comm->size() > 1)
- mpi_coll_bcast_fun(buf, count, datatype, root, comm);
+ Colls::bcast(buf, count, datatype, root, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_BARRIER;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- mpi_coll_barrier_fun(comm);
+ Colls::barrier(comm);
+
+ //Barrier can be used to synchronize RMA calls. Finish all requests from comm before.
+ comm->finish_rma_calls();
+
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
sendtmpcount=0;
sendtmptype=recvtype;
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_GATHER;
extra->datatype1 = encode_datatype(sendtmptype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(sendtmptype);
+ dt_size_send = sendtmptype->size();
extra->send_size = sendtmpcount * dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if ((comm->rank() == root) && known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recv_size = recvcount * dt_size_recv;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
- mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm);
+ Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
sendtmptype=recvtype;
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
int i = 0;
int size = comm->size();
extra->datatype1 = encode_datatype(sendtmptype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
extra->send_size = sendtmpcount * dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if (known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
if ((comm->rank() == root)) {
extra->recvcounts = xbt_new(int, size);
for (i = 0; i < size; i++) // copy data to avoid bad free
}
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
- smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm);
- retval = MPI_SUCCESS;
+ retval = Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm);
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
}
retval = MPI_ERR_COUNT;
} else {
if(sendbuf == MPI_IN_PLACE) {
- sendbuf=static_cast<char*>(recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*comm->rank();
+ sendbuf=static_cast<char*>(recvbuf)+recvtype->get_extent()*recvcount*comm->rank();
sendcount=recvcount;
sendtype=recvtype;
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_ALLGATHER;
int known = 0;
extra->datatype1 = encode_datatype(sendtype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
extra->send_size = sendcount * dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if (known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recv_size = recvcount * dt_size_recv;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
+ Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
}
} else {
if(sendbuf == MPI_IN_PLACE) {
- sendbuf=static_cast<char*>(recvbuf)+smpi_datatype_get_extent(recvtype)*displs[comm->rank()];
+ sendbuf=static_cast<char*>(recvbuf)+recvtype->get_extent()*displs[comm->rank()];
sendcount=recvcounts[comm->rank()];
sendtype=recvtype;
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int i = 0;
int size = comm->size();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->datatype1 = encode_datatype(sendtype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
extra->send_size = sendcount * dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if (known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recvcounts = xbt_new(int, size);
for (i = 0; i < size; i++) // copy data to avoid bad free
extra->recvcounts[i] = recvcounts[i] * dt_size_recv;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- mpi_coll_allgatherv_fun(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
+ Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
}
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (((comm->rank() == root) && (!is_datatype_valid(sendtype))) ||
- ((recvbuf != MPI_IN_PLACE) && (!is_datatype_valid(recvtype)))) {
+ } else if (((comm->rank() == root) && (!sendtype->is_valid())) ||
+ ((recvbuf != MPI_IN_PLACE) && (!recvtype->is_valid()))) {
retval = MPI_ERR_TYPE;
} else if ((sendbuf == recvbuf) ||
((comm->rank()==root) && sendcount>0 && (sendbuf == nullptr))){
recvtype = sendtype;
recvcount = sendcount;
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_SCATTER;
extra->datatype1 = encode_datatype(sendtype, &known);
int dt_size_send = 1;
if ((comm->rank() == root) && known == 0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
extra->send_size = sendcount * dt_size_send;
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if (known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recv_size = recvcount * dt_size_recv;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
- mpi_coll_scatter_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm);
+ Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
}
recvtype = sendtype;
recvcount = sendcounts[comm->rank()];
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
int i = 0;
int size = comm->size();
extra->datatype1 = encode_datatype(sendtype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(sendtype);
+ dt_size_send = sendtype->size();
if ((comm->rank() == root)) {
extra->sendcounts = xbt_new(int, size);
for (i = 0; i < size; i++) // copy data to avoid bad free
extra->datatype2 = encode_datatype(recvtype, &known);
int dt_size_recv = 1;
if (known == 0)
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
extra->recv_size = recvcount * dt_size_recv;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
- smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm);
+ retval = Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm);
- retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
}
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype) || op == MPI_OP_NULL) {
+ } else if (!datatype->is_valid() || op == MPI_OP_NULL) {
retval = MPI_ERR_ARG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int root_traced = comm->group()->index(root);
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_REDUCE;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
extra->root = root_traced;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
- mpi_coll_reduce_fun(sendbuf, recvbuf, count, datatype, op, root, comm);
+ Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
int retval = 0;
smpi_bench_end();
- if (!is_datatype_valid(datatype) || op == MPI_OP_NULL) {
+ if (!datatype->is_valid() || op == MPI_OP_NULL) {
retval = MPI_ERR_ARG;
} else {
- if(op!=MPI_OP_NULL) op->apply( inbuf, inoutbuf, &count, datatype);
+ op->apply(inbuf, inoutbuf, &count, datatype);
retval = MPI_SUCCESS;
}
smpi_bench_begin();
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
char* sendtmpbuf = static_cast<char*>(sendbuf);
if( sendbuf == MPI_IN_PLACE ) {
- sendtmpbuf = static_cast<char*>(xbt_malloc(count*smpi_datatype_get_extent(datatype)));
- smpi_datatype_copy(recvbuf, count, datatype,sendtmpbuf, count, datatype);
+ sendtmpbuf = static_cast<char*>(xbt_malloc(count*datatype->get_extent()));
+ Datatype::copy(recvbuf, count, datatype,sendtmpbuf, count, datatype);
}
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_ALLREDUCE;
int known = 0;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- mpi_coll_allreduce_fun(sendtmpbuf, recvbuf, count, datatype, op, comm);
+ Colls::allreduce(sendtmpbuf, recvbuf, count, datatype, op, comm);
if( sendbuf == MPI_IN_PLACE )
xbt_free(sendtmpbuf);
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_SCAN;
int known = 0;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm);
+ retval = Colls::scan(sendbuf, recvbuf, count, datatype, op, comm);
- retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
}
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_EXSCAN;
int known = 0;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = count * dt_size_send;
void* sendtmpbuf = sendbuf;
if (sendbuf == MPI_IN_PLACE) {
- sendtmpbuf = static_cast<void*>(xbt_malloc(count * smpi_datatype_size(datatype)));
- memcpy(sendtmpbuf, recvbuf, count * smpi_datatype_size(datatype));
+ sendtmpbuf = static_cast<void*>(xbt_malloc(count * datatype->size()));
+ memcpy(sendtmpbuf, recvbuf, count * datatype->size());
}
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- smpi_mpi_exscan(sendtmpbuf, recvbuf, count, datatype, op, comm);
- retval = MPI_SUCCESS;
+ retval = Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm);
+
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
if (sendbuf == MPI_IN_PLACE)
xbt_free(sendtmpbuf);
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!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 {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int i = 0;
int size = comm->size();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = 0;
extra->recvcounts = xbt_new(int, size);
int totalcount = 0;
}
void* sendtmpbuf = sendbuf;
if (sendbuf == MPI_IN_PLACE) {
- sendtmpbuf = static_cast<void*>(xbt_malloc(totalcount * smpi_datatype_size(datatype)));
- memcpy(sendtmpbuf, recvbuf, totalcount * smpi_datatype_size(datatype));
+ sendtmpbuf = static_cast<void*>(xbt_malloc(totalcount * datatype->size()));
+ memcpy(sendtmpbuf, recvbuf, totalcount * datatype->size());
}
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm);
+ Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm);
retval = MPI_SUCCESS;
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
retval = MPI_ERR_TYPE;
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
} else {
int count = comm->size();
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_REDUCE_SCATTER;
extra->num_processes = count;
extra->datatype1 = encode_datatype(datatype, &known);
int dt_size_send = 1;
if (known == 0)
- dt_size_send = smpi_datatype_size(datatype);
+ dt_size_send = datatype->size();
extra->send_size = 0;
extra->recvcounts = xbt_new(int, count);
for (int i = 0; i < count; i++) // copy data to avoid bad free
extra->recvcounts[i] = recvcount * dt_size_send;
void* sendtmpbuf = sendbuf;
if (sendbuf == MPI_IN_PLACE) {
- sendtmpbuf = static_cast<void*>(xbt_malloc(recvcount * count * smpi_datatype_size(datatype)));
- memcpy(sendtmpbuf, recvbuf, recvcount * count * smpi_datatype_size(datatype));
+ sendtmpbuf = static_cast<void*>(xbt_malloc(recvcount * count * datatype->size()));
+ memcpy(sendtmpbuf, recvbuf, recvcount * count * datatype->size());
}
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
int* recvcounts = static_cast<int*>(xbt_malloc(count * sizeof(int)));
for (int i = 0; i < count; i++)
recvcounts[i] = recvcount;
- mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm);
+ Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm);
xbt_free(recvcounts);
retval = MPI_SUCCESS;
} else if ((sendbuf != MPI_IN_PLACE && sendtype == MPI_DATATYPE_NULL) || recvtype == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
extra->type = TRACING_ALLTOALL;
int sendtmpcount = sendcount;
MPI_Datatype sendtmptype = sendtype;
if (sendbuf == MPI_IN_PLACE) {
- sendtmpbuf = static_cast<void*>(xbt_malloc(recvcount * comm->size() * smpi_datatype_size(recvtype)));
- memcpy(sendtmpbuf, recvbuf, recvcount * comm->size() * smpi_datatype_size(recvtype));
+ sendtmpbuf = static_cast<void*>(xbt_malloc(recvcount * comm->size() * recvtype->size()));
+ memcpy(sendtmpbuf, recvbuf, recvcount * comm->size() * recvtype->size());
sendtmpcount = recvcount;
sendtmptype = recvtype;
}
int known = 0;
extra->datatype1 = encode_datatype(sendtmptype, &known);
if (known == 0)
- extra->send_size = sendtmpcount * smpi_datatype_size(sendtmptype);
+ extra->send_size = sendtmpcount * sendtmptype->size();
else
extra->send_size = sendtmpcount;
extra->datatype2 = encode_datatype(recvtype, &known);
if (known == 0)
- extra->recv_size = recvcount * smpi_datatype_size(recvtype);
+ extra->recv_size = recvcount * recvtype->size();
else
extra->recv_size = recvcount;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- retval = mpi_coll_alltoall_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm);
+ retval = Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm);
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
recvdisps == nullptr) {
retval = MPI_ERR_ARG;
} else {
- int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1;
+ int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1;
int i = 0;
int size = comm->size();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1);
int known = 0;
int dt_size_recv = 1;
extra->datatype2 = encode_datatype(recvtype, &known);
- dt_size_recv = smpi_datatype_size(recvtype);
+ dt_size_recv = recvtype->size();
void* sendtmpbuf = static_cast<char*>(sendbuf);
int* sendtmpcounts = sendcounts;
extra->datatype1 = encode_datatype(sendtmptype, &known);
int dt_size_send = 1;
- dt_size_send = smpi_datatype_size(sendtmptype);
+ dt_size_send = sendtmptype->size();
for (i = 0; i < size; i++) { // copy data to avoid bad free
extra->send_size += sendtmpcounts[i] * dt_size_send;
}
extra->num_processes = size;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
- retval = mpi_coll_alltoallv_fun(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts,
+ retval = Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts,
recvdisps, recvtype, comm);
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
{
if (status == nullptr || count == nullptr) {
return MPI_ERR_ARG;
- } else if (!is_datatype_valid(datatype)) {
+ } else if (!datatype->is_valid()) {
return MPI_ERR_TYPE;
} else {
- size_t size = smpi_datatype_size(datatype);
+ size_t size = datatype->size();
if (size == 0) {
*count = 0;
return MPI_SUCCESS;
} else if (status->count % size != 0) {
return MPI_UNDEFINED;
} else {
- *count = smpi_mpi_get_count(status, datatype);
+ *count = Status::get_count(status, datatype);
return MPI_SUCCESS;
}
}
} else if (count<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_contiguous(count, old_type, new_type, 0);
+ return Datatype::create_contiguous(count, old_type, 0, new_type);
}
}
if (datatype == nullptr || *datatype == MPI_DATATYPE_NULL) {
return MPI_ERR_TYPE;
} else {
- smpi_datatype_commit(datatype);
+ (*datatype)->commit();
return MPI_SUCCESS;
}
}
} else if (count<0 || blocklen<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_vector(count, blocklen, stride, old_type, new_type);
+ return Datatype::create_vector(count, blocklen, stride, old_type, new_type);
}
}
} else if (count<0 || blocklen<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_hvector(count, blocklen, stride, old_type, new_type);
+ return Datatype::create_hvector(count, blocklen, stride, old_type, new_type);
}
}
} else if (count<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
+ return Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
}
}
} else if (count<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
+ return Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
}
}
int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count*sizeof(int)));
for (int i = 0; i < count; i++)
blocklens[i]=blocklength;
- int retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
+ int retval = Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
xbt_free(blocklens);
return retval;
}
} else if (count<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type);
+ return Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
}
}
int* blocklens=(int*)xbt_malloc(blocklength*count*sizeof(int));
for (int i = 0; i < count; i++)
blocklens[i] = blocklength;
- int retval = smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type);
+ int retval = Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
xbt_free(blocklens);
return retval;
}
if (count<0){
return MPI_ERR_COUNT;
} else {
- return smpi_datatype_struct(count, blocklens, indices, old_types, new_type);
+ return Datatype::create_struct(count, blocklens, indices, old_types, new_type);
}
}
}
int PMPI_Initialized(int* flag) {
- *flag=smpi_process_initialized();
+ *flag=(smpi_process()!=nullptr && smpi_process()->initialized());
return MPI_SUCCESS;
}
} else if (ndims < 0 || (ndims > 0 && (dims == nullptr || periodic == nullptr)) || comm_cart == nullptr) {
return MPI_ERR_ARG;
} else{
- new Topo_Cart(comm_old, ndims, dims, periodic, reorder, comm_cart);
+ Topo_Cart* topo = new Topo_Cart(comm_old, ndims, dims, periodic, reorder, comm_cart);
+ if(*comm_cart==MPI_COMM_NULL)
+ delete topo;
return MPI_SUCCESS;
}
}
return MPI_ERR_ARG;
}
MPIR_Cart_Topology cart = topo->sub(remain_dims, comm_new);
+ if(*comm_new==MPI_COMM_NULL)
+ delete cart;
if(cart==nullptr)
return MPI_ERR_ARG;
return MPI_SUCCESS;
MPI_Aint disps[3] = {lb, 0, lb + extent};
MPI_Datatype types[3] = {MPI_LB, oldtype, MPI_UB};
- s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create(blocks, disps, 3, types);
- smpi_datatype_create(newtype, oldtype->size(), lb, lb + extent, sizeof(s_smpi_mpi_struct_t), subtype, DT_FLAG_VECTOR);
+ *newtype = new Type_Struct(oldtype->size(), lb, lb + extent, DT_FLAG_DERIVED, 3, blocks, disps, types);
(*newtype)->addflag(~DT_FLAG_COMMITED);
return MPI_SUCCESS;
if (win == nullptr || *win == MPI_WIN_NULL) {
retval = MPI_ERR_WIN;
}else{
- delete(*win);
+ delete *win;
retval=MPI_SUCCESS;
}
smpi_bench_begin();
return MPI_ERR_WIN;
}else {
win->get_group(group);
- (*group)->use();
+ (*group)->ref();
return MPI_SUCCESS;
}
}
if (win == MPI_WIN_NULL) {
retval = MPI_ERR_WIN;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr);
retval = win->fence(assert);
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
} else if ((origin_count < 0 || target_count < 0) ||
(origin_addr==nullptr && origin_count > 0)){
retval = MPI_ERR_COUNT;
- } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) {
+ } else if ((!origin_datatype->is_valid()) || (!target_datatype->is_valid())) {
retval = MPI_ERR_TYPE;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
MPI_Group group;
win->get_group(&group);
int src_traced = group->index(target_rank);
} else if ((origin_count < 0 || target_count < 0) ||
(origin_addr==nullptr && origin_count > 0)){
retval = MPI_ERR_COUNT;
- } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) {
+ } else if ((!origin_datatype->is_valid()) || (!target_datatype->is_valid())) {
retval = MPI_ERR_TYPE;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
MPI_Group group;
win->get_group(&group);
int dst_traced = group->index(target_rank);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, nullptr);
- TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*smpi_datatype_size(origin_datatype));
+ TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size());
retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
target_datatype);
} else if ((origin_count < 0 || target_count < 0) ||
(origin_addr==nullptr && origin_count > 0)){
retval = MPI_ERR_COUNT;
- } else if ((!is_datatype_valid(origin_datatype)) ||
- (!is_datatype_valid(target_datatype))) {
+ } else if ((!origin_datatype->is_valid()) ||
+ (!target_datatype->is_valid())) {
retval = MPI_ERR_TYPE;
} else if (op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
MPI_Group group;
win->get_group(&group);
int src_traced = group->index(target_rank);
} else if (group==MPI_GROUP_NULL){
retval = MPI_ERR_GROUP;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr);
retval = win->post(group,assert);
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
} else if (group==MPI_GROUP_NULL){
retval = MPI_ERR_GROUP;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr);
retval = win->start(group,assert);
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
if (win == MPI_WIN_NULL) {
retval = MPI_ERR_WIN;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr);
retval = win->complete();
if (win == MPI_WIN_NULL) {
retval = MPI_ERR_WIN;
} else {
- int rank = smpi_process_index();
+ int rank = smpi_process()->index();
TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr);
retval = win->wait();
return retval;
}
+int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){
+ int retval = 0;
+ smpi_bench_end();
+ if (win == MPI_WIN_NULL) {
+ retval = MPI_ERR_WIN;
+ } else if (lock_type != MPI_LOCK_EXCLUSIVE &&
+ lock_type != MPI_LOCK_SHARED) {
+ retval = MPI_ERR_LOCKTYPE;
+ } else if (rank == MPI_PROC_NULL){
+ retval = MPI_SUCCESS;
+ } else {
+ int myrank = smpi_process()->index();
+ TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr);
+ retval = win->lock(lock_type,rank,assert);
+ TRACE_smpi_collective_out(myrank, -1, __FUNCTION__);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
+int PMPI_Win_unlock(int rank, MPI_Win win){
+ int retval = 0;
+ smpi_bench_end();
+ if (win == MPI_WIN_NULL) {
+ retval = MPI_ERR_WIN;
+ } else if (rank == MPI_PROC_NULL){
+ retval = MPI_SUCCESS;
+ } else {
+ int myrank = smpi_process()->index();
+ TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr);
+ retval = win->unlock(rank);
+ TRACE_smpi_collective_out(myrank, -1, __FUNCTION__);
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr){
void *ptr = xbt_malloc(size);
if(ptr==nullptr)
} else if (name == nullptr) {
return MPI_ERR_ARG;
} else {
- smpi_datatype_set_name(datatype, name);
+ datatype->set_name(name);
return MPI_SUCCESS;
}
}
} else if (name == nullptr) {
return MPI_ERR_ARG;
} else {
- smpi_datatype_get_name(datatype, name, len);
+ datatype->get_name(name, len);
return MPI_SUCCESS;
}
}
MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype){
- return smpi_type_f2c(datatype);
+ return static_cast<MPI_Datatype>(F2C::f2c(datatype));
}
MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype){
- return smpi_type_c2f( datatype);
+ return datatype->c2f();
}
MPI_Group PMPI_Group_f2c(MPI_Fint group){
- return smpi_group_f2c( group);
+ return Group::f2c(group);
}
MPI_Fint PMPI_Group_c2f(MPI_Group group){
- return smpi_group_c2f(group);
+ return group->c2f();
}
MPI_Request PMPI_Request_f2c(MPI_Fint request){
- return smpi_request_f2c(request);
+ return static_cast<MPI_Request>(Request::f2c(request));
}
MPI_Fint PMPI_Request_c2f(MPI_Request request) {
- return smpi_request_c2f(request);
+ return request->c2f();
}
MPI_Win PMPI_Win_f2c(MPI_Fint win){
- return smpi_win_f2c(win);
+ return static_cast<MPI_Win>(Win::f2c(win));
}
MPI_Fint PMPI_Win_c2f(MPI_Win win){
- return smpi_win_c2f(win);
+ return win->c2f();
}
MPI_Op PMPI_Op_f2c(MPI_Fint op){
- return smpi_op_f2c(op);
+ return static_cast<MPI_Op>(Op::f2c(op));
}
MPI_Fint PMPI_Op_c2f(MPI_Op op){
- return smpi_op_c2f(op);
+ return op->c2f();
}
MPI_Comm PMPI_Comm_f2c(MPI_Fint comm){
- return smpi_comm_f2c(comm);
+ return static_cast<MPI_Comm>(Comm::f2c(comm));
}
MPI_Fint PMPI_Comm_c2f(MPI_Comm comm){
- return smpi_comm_c2f(comm);
+ return comm->c2f();
}
MPI_Info PMPI_Info_f2c(MPI_Fint info){
- return smpi_info_f2c(info);
+ return static_cast<MPI_Info>(Info::f2c(info));
}
MPI_Fint PMPI_Info_c2f(MPI_Info info){
- return smpi_info_c2f(info);
+ return info->c2f();
}
int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) {
- return smpi_comm_keyval_create(copy_fn, delete_fn, keyval, extra_state);
+ smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr};
+ smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr};
+ return Keyval::keyval_create<Comm>(_copy_fn, _delete_fn, keyval, extra_state);
}
int PMPI_Keyval_free(int* keyval) {
- return smpi_comm_keyval_free(keyval);
+ return Keyval::keyval_free<Comm>(keyval);
}
int PMPI_Attr_delete(MPI_Comm comm, int keyval) {
else if (comm==MPI_COMM_NULL)
return MPI_ERR_COMM;
else
- return comm->attr_delete(keyval);
+ return comm->attr_delete<Comm>(keyval);
}
int PMPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) {
*static_cast<int**>(attr_value) = &one;
return MPI_SUCCESS;
default:
- return comm->attr_get(keyval, attr_value, flag);
+ return comm->attr_get<Comm>(keyval, attr_value, flag);
}
}
else if (comm==MPI_COMM_NULL)
return MPI_ERR_COMM;
else
- return comm->attr_put(keyval, attr_value);
+ return comm->attr_put<Comm>(keyval, attr_value);
}
int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)
if (type==MPI_DATATYPE_NULL)
return MPI_ERR_TYPE;
else
- return smpi_type_attr_get(type, type_keyval, attribute_val, flag);
+ return type->attr_get<Datatype>(type_keyval, attribute_val, flag);
}
int PMPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val)
if (type==MPI_DATATYPE_NULL)
return MPI_ERR_TYPE;
else
- return smpi_type_attr_put(type, type_keyval, attribute_val);
+ return type->attr_put<Datatype>(type_keyval, attribute_val);
}
int PMPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
if (type==MPI_DATATYPE_NULL)
return MPI_ERR_TYPE;
else
- return smpi_type_attr_delete(type, type_keyval);
+ return type->attr_delete<Datatype>(type_keyval);
}
int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval,
void* extra_state)
{
- return smpi_type_keyval_create(copy_fn, delete_fn, keyval, extra_state);
+ smpi_copy_fn _copy_fn={nullptr,copy_fn,nullptr};
+ smpi_delete_fn _delete_fn={nullptr,delete_fn,nullptr};
+ return Keyval::keyval_create<Datatype>(_copy_fn, _delete_fn, keyval, extra_state);
}
int PMPI_Type_free_keyval(int* keyval) {
- return smpi_type_keyval_free(keyval);
+ return Keyval::keyval_free<Datatype>(keyval);
+}
+
+int PMPI_Win_get_attr (MPI_Win win, int keyval, void *attribute_val, int* flag)
+{
+ static MPI_Aint size;
+ static int disp_unit;
+ if (win==MPI_WIN_NULL)
+ return MPI_ERR_TYPE;
+ else{
+ switch (keyval) {
+ case MPI_WIN_BASE :
+ *static_cast<void**>(attribute_val) = win->base();
+ *flag = 1;
+ return MPI_SUCCESS;
+ case MPI_WIN_SIZE :
+ size = win->size();
+ *static_cast<MPI_Aint**>(attribute_val) = &size;
+ *flag = 1;
+ return MPI_SUCCESS;
+ case MPI_WIN_DISP_UNIT :
+ disp_unit=win->disp_unit();
+ *static_cast<int**>(attribute_val) = &disp_unit;
+ *flag = 1;
+ return MPI_SUCCESS;
+ default:
+ return win->attr_get<Win>(keyval, attribute_val, flag);
+ }
+}
+
+}
+
+int PMPI_Win_set_attr (MPI_Win win, int type_keyval, void *attribute_val)
+{
+ if (win==MPI_WIN_NULL)
+ return MPI_ERR_TYPE;
+ else
+ return win->attr_put<Win>(type_keyval, attribute_val);
+}
+
+int PMPI_Win_delete_attr (MPI_Win win, int type_keyval)
+{
+ if (win==MPI_WIN_NULL)
+ return MPI_ERR_TYPE;
+ else
+ return win->attr_delete<Win>(type_keyval);
+}
+
+int PMPI_Win_create_keyval(MPI_Win_copy_attr_function* copy_fn, MPI_Win_delete_attr_function* delete_fn, int* keyval,
+ void* extra_state)
+{
+ smpi_copy_fn _copy_fn={nullptr, nullptr, copy_fn};
+ smpi_delete_fn _delete_fn={nullptr, nullptr, delete_fn};
+ return Keyval::keyval_create<Win>(_copy_fn, _delete_fn, keyval, extra_state);
+}
+
+int PMPI_Win_free_keyval(int* keyval) {
+ return Keyval::keyval_free<Win>(keyval);
}
int PMPI_Info_create( MPI_Info *info){
if (info == nullptr)
return MPI_ERR_ARG;
- *info = xbt_new(s_smpi_mpi_info_t, 1);
- (*info)->info_dict= xbt_dict_new_homogeneous(xbt_free_f);
- (*info)->refcount=1;
+ *info = new Info();
return MPI_SUCCESS;
}
int PMPI_Info_set( MPI_Info info, char *key, char *value){
if (info == nullptr || key == nullptr || value == nullptr)
return MPI_ERR_ARG;
-
- xbt_dict_set(info->info_dict, key, xbt_strdup(value), nullptr);
+ info->set(key, value);
return MPI_SUCCESS;
}
int PMPI_Info_free( MPI_Info *info){
if (info == nullptr || *info==nullptr)
return MPI_ERR_ARG;
- (*info)->refcount--;
- if((*info)->refcount==0){
- xbt_dict_free(&((*info)->info_dict));
- xbt_free(*info);
- }
+ Info::unref(*info);
*info=MPI_INFO_NULL;
return MPI_SUCCESS;
}
return MPI_ERR_ARG;
if (value == nullptr)
return MPI_ERR_INFO_VALUE;
- char* tmpvalue=static_cast<char*>(xbt_dict_get_or_null(info->info_dict, key));
- if(tmpvalue){
- memset(value, 0, valuelen);
- memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast<size_t>(valuelen)) ? strlen(tmpvalue) + 1 : valuelen);
- *flag=true;
- }
- return MPI_SUCCESS;
+ return info->get(key, valuelen, value, flag);
}
int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){
if (info == nullptr || newinfo==nullptr)
return MPI_ERR_ARG;
- *newinfo = xbt_new(s_smpi_mpi_info_t, 1);
- (*newinfo)->info_dict= xbt_dict_new_homogeneous(xbt_free_f);
- (*newinfo)->refcount=1;
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- void* data;
- xbt_dict_foreach(info->info_dict,cursor,key,data){
- xbt_dict_set((*newinfo)->info_dict, key, xbt_strdup(static_cast<char*>(data)), nullptr);
- }
+ *newinfo = new Info(info);
return MPI_SUCCESS;
}
int PMPI_Info_delete(MPI_Info info, char *key){
if (info == nullptr || key==nullptr)
return MPI_ERR_ARG;
- try {
- xbt_dict_remove(info->info_dict, key);
- }
- catch(xbt_ex& e){
- return MPI_ERR_INFO_NOKEY;
- }
- return MPI_SUCCESS;
+ return info->remove(key);
}
int PMPI_Info_get_nkeys( MPI_Info info, int *nkeys){
if (info == nullptr || nkeys==nullptr)
return MPI_ERR_ARG;
- *nkeys=xbt_dict_size(info->info_dict);
- return MPI_SUCCESS;
+ return info->get_nkeys(nkeys);
}
int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){
if (info == nullptr || key==nullptr || n<0 || n> MPI_MAX_INFO_KEY)
return MPI_ERR_ARG;
-
- xbt_dict_cursor_t cursor = nullptr;
- char *keyn;
- void* data;
- int num=0;
- xbt_dict_foreach(info->info_dict,cursor,keyn,data){
- if(num==n){
- strncpy(key,keyn,strlen(keyn)+1);
- xbt_dict_cursor_free(&cursor);
- return MPI_SUCCESS;
- }
- num++;
- }
- return MPI_ERR_ARG;
+ return info->get_nthkey(n, key);
}
int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){
*flag=false;
if (info == nullptr || key == nullptr || valuelen==nullptr)
return MPI_ERR_ARG;
- char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key);
- if(tmpvalue){
- *valuelen=strlen(tmpvalue);
- *flag=true;
- }
- return MPI_SUCCESS;
+ return info->get_valuelen(key, valuelen, flag);
}
int PMPI_Unpack(void* inbuf, int incount, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) {
if(incount<0 || outcount < 0 || inbuf==nullptr || outbuf==nullptr)
return MPI_ERR_ARG;
- if(!is_datatype_valid(type))
+ if(!type->is_valid())
return MPI_ERR_TYPE;
if(comm==MPI_COMM_NULL)
return MPI_ERR_COMM;
- return smpi_mpi_unpack(inbuf, incount, position, outbuf,outcount,type, comm);
+ return type->unpack(inbuf, incount, position, outbuf,outcount, comm);
}
int PMPI_Pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm) {
if(incount<0 || outcount < 0|| inbuf==nullptr || outbuf==nullptr)
return MPI_ERR_ARG;
- if(!is_datatype_valid(type))
+ if(!type->is_valid())
return MPI_ERR_TYPE;
if(comm==MPI_COMM_NULL)
return MPI_ERR_COMM;
- return smpi_mpi_pack(inbuf, incount, type, outbuf,outcount,position, comm);
+ return type->pack(inbuf, incount, outbuf,outcount,position, comm);
}
int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) {
if(incount<0)
return MPI_ERR_ARG;
- if(!is_datatype_valid(datatype))
+ if(!datatype->is_valid())
return MPI_ERR_TYPE;
if(comm==MPI_COMM_NULL)
return MPI_ERR_COMM;
- *size=incount*smpi_datatype_size(datatype);
+ *size=incount*datatype->size();
return MPI_SUCCESS;
}
