X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a02e2aa661bb0703e5006fc8866a1a0837119f9c..8e43c615b2475d0174be55f95f930ca30988279e:/src/smpi/smpi_pmpi.cpp diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index 704aaad589..6d660d0baf 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -1,10 +1,10 @@ - -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include #include #include "private.h" @@ -23,6 +23,7 @@ void TRACE_smpi_set_category(const char *category) } /* PMPI User level calls */ +extern "C" { // Obviously, the C MPI interface should use the C linkage int PMPI_Init(int *argc, char ***argv) { @@ -76,13 +77,12 @@ int PMPI_Get_version (int *version,int *subversion){ } int PMPI_Get_library_version (char *version,int *len){ - int retval = MPI_SUCCESS; smpi_bench_end(); snprintf(version,MPI_MAX_LIBRARY_VERSION_STRING,"SMPI Version %d.%d. Copyright The Simgrid Team 2007-2015", SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR); *len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version); smpi_bench_begin(); - return retval; + return MPI_SUCCESS; } int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) @@ -95,28 +95,22 @@ int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) int PMPI_Query_thread(int *provided) { - int retval = 0; - if (provided == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *provided = MPI_THREAD_SINGLE; - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Is_thread_main(int *flag) { - int retval = 0; - if (flag == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *flag = smpi_process_index() == 0; - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Abort(MPI_Comm comm, int errorcode) @@ -141,15 +135,12 @@ double PMPI_Wtick() int PMPI_Address(void *location, MPI_Aint * address) { - int retval = 0; - if (address==nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *address = reinterpret_cast(location); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Get_address(void *location, MPI_Aint * address) @@ -159,44 +150,48 @@ int PMPI_Get_address(void *location, MPI_Aint * address) int PMPI_Type_free(MPI_Datatype * datatype) { - int retval = 0; /* Free a predefined datatype is an error according to the standard, and should be checked for */ if (*datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { smpi_datatype_unuse(*datatype); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_size(MPI_Datatype datatype, int *size) { - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (size == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *size = static_cast(smpi_datatype_size(datatype)); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } -int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) +int PMPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size) { - int retval = 0; + if (datatype == MPI_DATATYPE_NULL) { + return MPI_ERR_TYPE; + } else if (size == nullptr) { + return MPI_ERR_ARG; + } else { + *size = static_cast(smpi_datatype_size(datatype)); + return MPI_SUCCESS; + } +} +int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) +{ if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (lb == nullptr || extent == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - retval = smpi_datatype_extent(datatype, lb, extent); + return smpi_datatype_extent(datatype, lb, extent); } - return retval; } int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) @@ -206,622 +201,382 @@ int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * e int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) { - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (extent == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *extent = smpi_datatype_get_extent(datatype); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp) { - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (disp == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *disp = smpi_datatype_lb(datatype); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp) { - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (disp == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *disp = smpi_datatype_ub(datatype); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype){ - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else { - retval = smpi_datatype_dup(datatype, newtype); + return smpi_datatype_dup(datatype, newtype); } - return retval; } int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op) { - int retval = 0; - if (function == nullptr || op == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { *op = smpi_op_new(function, (commute!=0)); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Op_free(MPI_Op * op) { - int retval = 0; - if (op == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else if (*op == MPI_OP_NULL) { - retval = MPI_ERR_OP; + return MPI_ERR_OP; } else { smpi_op_destroy(*op); *op = MPI_OP_NULL; - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Group_free(MPI_Group * group) { - int retval = 0; - if (group == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - smpi_group_destroy(*group); + (*group)->destroy(); *group = MPI_GROUP_NULL; - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Group_size(MPI_Group group, int *size) { - int retval = 0; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (size == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *size = smpi_group_size(group); - retval = MPI_SUCCESS; + *size = group->size(); + return MPI_SUCCESS; } - return retval; } int PMPI_Group_rank(MPI_Group group, int *rank) { - int retval = 0; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (rank == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *rank = smpi_group_rank(group, smpi_process_index()); - retval = MPI_SUCCESS; + *rank = group->rank(smpi_process_index()); + return MPI_SUCCESS; } - return retval; } int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2) { - int retval, i, index; if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else { - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { if(ranks1[i]==MPI_PROC_NULL){ ranks2[i]=MPI_PROC_NULL; }else{ - index = smpi_group_index(group1, ranks1[i]); - ranks2[i] = smpi_group_rank(group2, index); + int index = group1->index(ranks1[i]); + ranks2[i] = group2->rank(index); } } - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) { - int retval = 0; - if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (result == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *result = smpi_group_compare(group1, group2); - retval = MPI_SUCCESS; + *result = group1->compare(group2); + return MPI_SUCCESS; } - return retval; } int PMPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) { - int retval, i, proc1, proc2, size, size2; if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - size = smpi_group_size(group1); - size2 = smpi_group_size(group2); - for (i = 0; i < size2; i++) { - proc2 = smpi_group_index(group2, i); - proc1 = smpi_group_rank(group1, proc2); - if (proc1 == MPI_UNDEFINED) { - size++; - } - } - if (size == 0) { - *newgroup = MPI_GROUP_EMPTY; - } else { - *newgroup = smpi_group_new(size); - size2 = smpi_group_size(group1); - for (i = 0; i < size2; i++) { - proc1 = smpi_group_index(group1, i); - smpi_group_set_mapping(*newgroup, proc1, i); - } - for (i = size2; i < size; i++) { - proc2 = smpi_group_index(group2, i - size2); - smpi_group_set_mapping(*newgroup, proc2, i); - } - } - retval = MPI_SUCCESS; + return group1->group_union(group2, newgroup); } - return retval; } int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) { - int retval, i, proc1, proc2, size; if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - size = smpi_group_size(group2); - for (i = 0; i < size; i++) { - proc2 = smpi_group_index(group2, i); - proc1 = smpi_group_rank(group1, proc2); - if (proc1 == MPI_UNDEFINED) { - size--; - } - } - if (size == 0) { - *newgroup = MPI_GROUP_EMPTY; - } else { - *newgroup = smpi_group_new(size); - int j=0; - for (i = 0; i < smpi_group_size(group2); i++) { - proc2 = smpi_group_index(group2, i); - proc1 = smpi_group_rank(group1, proc2); - if (proc1 != MPI_UNDEFINED) { - smpi_group_set_mapping(*newgroup, proc2, j); - j++; - } - } - } - retval = MPI_SUCCESS; + return group1->intersection(group2,newgroup); } - return retval; } int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) { - int retval, i, proc1, proc2, size, size2; - if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - size = smpi_group_size(group1); - size2 = size; - for (i = 0; i < size2; i++) { - proc1 = smpi_group_index(group1, i); - proc2 = smpi_group_rank(group2, proc1); - if (proc2 != MPI_UNDEFINED) { - size--; - } - } - if (size == 0) { - *newgroup = MPI_GROUP_EMPTY; - } else { - *newgroup = smpi_group_new(size); - for (i = 0; i < size2; i++) { - proc1 = smpi_group_index(group1, i); - proc2 = smpi_group_rank(group2, proc1); - if (proc2 == MPI_UNDEFINED) { - smpi_group_set_mapping(*newgroup, proc1, i); - } - } - } - retval = MPI_SUCCESS; + return group1->difference(group2,newgroup); } - return retval; } int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) { - int retval; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - retval = smpi_group_incl(group, n, ranks, newgroup); + return group->incl(n, ranks, newgroup); } - return retval; } int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) { - int retval, i, j, newsize, oldsize, index; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL - && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) - smpi_group_use(group); - } else if (n == smpi_group_size(group)) { + if (group != MPI_COMM_WORLD->group() + && group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY) + group->use(); + return MPI_SUCCESS; + } else if (n == group->size()) { *newgroup = MPI_GROUP_EMPTY; + return MPI_SUCCESS; } else { - oldsize=smpi_group_size(group); - newsize = oldsize - n; - *newgroup = smpi_group_new(newsize); - - int* to_exclude=xbt_new0(int, smpi_group_size(group)); - for(i=0; iexcl(n,ranks,newgroup); } - retval = MPI_SUCCESS; } - return retval; } int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup) { - int retval, i, j, rank, size, index; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { if (n == 0) { *newgroup = MPI_GROUP_EMPTY; + return MPI_SUCCESS; } else { - size = 0; - for (i = 0; i < n; i++) { - for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank < smpi_group_size(group); /* Last */ - ) { - size++; - if(rank == ranges[i][1]){/*already last ?*/ - break; - } - rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] ranges[i][1]) - break; - }else{ - if(rank < ranges[i][1]) - break; + return group->range_incl(n,ranges,newgroup); } - } - } - - *newgroup = smpi_group_new(size); - j = 0; - for (i = 0; i < n; i++) { - for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank < smpi_group_size(group); /* Last */ - ) { - index = smpi_group_index(group, rank); - smpi_group_set_mapping(*newgroup, index, j); - j++; - if(rank == ranges[i][1]){/*already last ?*/ - break; - } - rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] ranges[i][1]) - break; - }else{ - if(rank < ranges[i][1]) - break; - } - } - } - } - retval = MPI_SUCCESS; } - return retval; } int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup) { - int retval, i, rank, newrank,oldrank, size, index, add; - if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newgroup == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL - && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) - smpi_group_use(group); + if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() && + group != MPI_GROUP_EMPTY) + group->use(); + return MPI_SUCCESS; } else { - size = smpi_group_size(group); - for (i = 0; i < n; i++) { - for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank < smpi_group_size(group); /* Last */ - ) { - size--; - if(rank == ranges[i][1]){/*already last ?*/ - break; - } - rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] ranges[i][1]) - break; - }else{ - if(rank < ranges[i][1]) - break; - } - } - } - if (size == 0) { - *newgroup = MPI_GROUP_EMPTY; - } else { - *newgroup = smpi_group_new(size); - newrank=0; - oldrank=0; - while (newrank < size) { - add=1; - for (i = 0; i < n; i++) { - for (rank = ranges[i][0]; - rank >= 0 && rank < smpi_group_size(group); - ){ - if(rank==oldrank){ - add=0; - break; - } - if(rank == ranges[i][1]){/*already last ?*/ - break; - } - rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] ranges[i][1]) - break; - }else{ - if(rank < ranges[i][1]) - break; - } - } - } - if(add==1){ - index = smpi_group_index(group, oldrank); - smpi_group_set_mapping(*newgroup, index, newrank); - newrank++; - } - oldrank++; - } - } + return group->range_excl(n,ranges,newgroup); } - - retval = MPI_SUCCESS; } - return retval; } int PMPI_Comm_rank(MPI_Comm comm, int *rank) { - int retval = 0; if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (rank == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *rank = smpi_comm_rank(comm); - retval = MPI_SUCCESS; + *rank = comm->rank(); + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_size(MPI_Comm comm, int *size) { - int retval = 0; if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (size == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *size = smpi_comm_size(comm); - retval = MPI_SUCCESS; + *size = comm->size(); + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_get_name (MPI_Comm comm, char* name, int* len) { - int retval = 0; - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (name == nullptr || len == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - smpi_comm_get_name(comm, name, len); - retval = MPI_SUCCESS; + comm->get_name(name, len); + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group) { - int retval = 0; - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (group == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - *group = smpi_comm_group(comm); - if(*group!= smpi_comm_group(MPI_COMM_WORLD) && *group != MPI_GROUP_NULL - && *group != MPI_GROUP_EMPTY) - smpi_group_use(*group); - retval = MPI_SUCCESS; + *group = comm->group(); + if (*group != MPI_COMM_WORLD->group() && *group != MPI_GROUP_NULL && *group != MPI_GROUP_EMPTY) + (*group)->use(); + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) { - int retval = 0; - if (comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (result == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { if (comm1 == comm2) { /* Same communicators means same groups */ *result = MPI_IDENT; } else { - *result = smpi_group_compare(smpi_comm_group(comm1), smpi_comm_group(comm2)); + *result = comm1->group()->compare(comm2->group()); if (*result == MPI_IDENT) { *result = MPI_CONGRUENT; } } - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm) { - int retval = 0; - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (newcomm == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { - retval = smpi_comm_dup(comm, newcomm); + return comm->dup(newcomm); } - return retval; } int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) { - int retval = 0; - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else if (group == MPI_GROUP_NULL) { - retval = MPI_ERR_GROUP; + return MPI_ERR_GROUP; } else if (newcomm == nullptr) { - retval = MPI_ERR_ARG; - } else if(smpi_group_rank(group,smpi_process_index())==MPI_UNDEFINED){ + return MPI_ERR_ARG; + } else if(group->rank(smpi_process_index())==MPI_UNDEFINED){ *newcomm= MPI_COMM_NULL; - retval = MPI_SUCCESS; + return MPI_SUCCESS; }else{ - smpi_group_use(group); - *newcomm = smpi_comm_new(group, nullptr); - retval = MPI_SUCCESS; + group->use(); + *newcomm = new simgrid::SMPI::Comm(group, nullptr); + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_free(MPI_Comm * comm) { - int retval = 0; - if (comm == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else if (*comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + return MPI_ERR_COMM; } else { - smpi_comm_destroy(*comm); + (*comm)->destroy(); *comm = MPI_COMM_NULL; - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Comm_disconnect(MPI_Comm * comm) { /* TODO: wait until all communication in comm are done */ + if (comm == nullptr) { + return MPI_ERR_ARG; + } else if (*comm == MPI_COMM_NULL) { + return MPI_ERR_COMM; + } else { + (*comm)->destroy(); + *comm = MPI_COMM_NULL; + return MPI_SUCCESS; + } +} + +int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) +{ int retval = 0; + smpi_bench_end(); - if (comm == nullptr) { + if (comm_out == nullptr) { retval = MPI_ERR_ARG; - } else if (*comm == MPI_COMM_NULL) { + } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - smpi_comm_destroy(*comm); - *comm = MPI_COMM_NULL; + *comm_out = comm->split(color, key); retval = MPI_SUCCESS; } + smpi_bench_begin(); + return retval; } -int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) +int PMPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int, MPI_Comm* comm_out) { int retval = 0; smpi_bench_end(); @@ -831,8 +586,7 @@ int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - *comm_out = smpi_comm_split(comm, color, key); - retval = MPI_SUCCESS; + retval = MPI_Comm_create(comm, group, comm_out); } smpi_bench_begin(); @@ -926,13 +680,12 @@ int PMPI_Start(MPI_Request * request) int PMPI_Startall(int count, MPI_Request * requests) { int retval; - int i = 0; smpi_bench_end(); if (requests == nullptr) { retval = MPI_ERR_ARG; } else { retval = MPI_SUCCESS; - for (i = 0 ; i < count ; i++) { + for (int i = 0; i < count; i++) { if(requests[i] == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } @@ -973,7 +726,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP } else if (src == MPI_PROC_NULL) { *request = MPI_REQUEST_NULL; retval = MPI_SUCCESS; - } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){ + } 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; @@ -984,7 +737,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int src_traced = smpi_group_index(smpi_comm_group(comm), src); + int src_traced = comm->group()->index(src); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_IRECV; @@ -1024,7 +777,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP } else if (dst == MPI_PROC_NULL) { *request = MPI_REQUEST_NULL; retval = MPI_SUCCESS; - } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ + } else if (dst >= comm->group()->size() || dst <0){ retval = MPI_ERR_RANK; } else if ((count < 0) || (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; @@ -1033,9 +786,8 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + int dst_traced = comm->group()->index(dst); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_ISEND; extra->src = rank; @@ -1047,7 +799,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1074,7 +826,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } else if (dst == MPI_PROC_NULL) { *request = MPI_REQUEST_NULL; retval = MPI_SUCCESS; - } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ + } else if (dst >= comm->group()->size() || dst <0){ retval = MPI_ERR_RANK; } else if ((count < 0)|| (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; @@ -1083,9 +835,8 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + int dst_traced = comm->group()->index(dst); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_ISSEND; extra->src = rank; @@ -1097,7 +848,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1123,7 +874,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI smpi_empty_status(status); status->MPI_SOURCE = MPI_PROC_NULL; retval = MPI_SUCCESS; - } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){ + } 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; @@ -1132,31 +883,31 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int src_traced = smpi_group_index(smpi_comm_group(comm), src); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_RECV; - extra->src = src_traced; - extra->dst = rank; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); + 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->src = src_traced; + extra->dst = rank; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(datatype); + extra->send_size = count * dt_size_send; + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); smpi_mpi_recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; - //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - if(status!=MPI_STATUS_IGNORE){ - src_traced = smpi_group_index(smpi_comm_group(comm), status->MPI_SOURCE); - if (!TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank); + // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) + if (status != MPI_STATUS_IGNORE) { + src_traced = comm->group()->index(status->MPI_SOURCE); + if (!TRACE_smpi_view_internals()) { + TRACE_smpi_recv(rank, src_traced, rank, tag); + } } - } - TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); + TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); } smpi_bench_begin(); @@ -1173,7 +924,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI retval = MPI_ERR_COMM; } else if (dst == MPI_PROC_NULL) { retval = MPI_SUCCESS; - } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ + } else if (dst >= comm->group()->size() || dst <0){ retval = MPI_ERR_RANK; } else if ((count < 0) || (buf == nullptr && count > 0)) { retval = MPI_ERR_COUNT; @@ -1183,7 +934,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI retval = MPI_ERR_TAG; } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + int dst_traced = comm->group()->index(dst); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_SEND; extra->src = rank; @@ -1197,7 +948,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI 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,count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); } smpi_mpi_send(buf, count, datatype, dst, tag, comm); @@ -1219,7 +970,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP retval = MPI_ERR_COMM; } else if (dst == MPI_PROC_NULL) { retval = MPI_SUCCESS; - } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ + } else if (dst >= comm->group()->size() || dst <0){ retval = MPI_ERR_RANK; } else if ((count < 0) || (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; @@ -1229,7 +980,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP retval = MPI_ERR_TAG; } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + int dst_traced = comm->group()->index(dst); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_SSEND; extra->src = rank; @@ -1242,7 +993,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP } extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1263,15 +1014,14 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (!is_datatype_valid(sendtype) - || !is_datatype_valid(recvtype)) { + } else if (!is_datatype_valid(sendtype) || !is_datatype_valid(recvtype)) { retval = MPI_ERR_TYPE; } else if (src == MPI_PROC_NULL || dst == MPI_PROC_NULL) { - smpi_empty_status(status); - status->MPI_SOURCE = MPI_PROC_NULL; - retval = MPI_SUCCESS; - }else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0 || - (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0))){ + smpi_empty_status(status); + status->MPI_SOURCE = MPI_PROC_NULL; + retval = MPI_SUCCESS; + }else if (dst >= comm->group()->size() || dst <0 || + (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){ retval = MPI_ERR_RANK; } else if ((sendcount < 0 || recvcount<0) || (sendbuf==nullptr && sendcount > 0) || (recvbuf==nullptr && recvcount>0)) { @@ -1281,8 +1031,8 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - int src_traced = smpi_group_index(smpi_comm_group(comm), src); + 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->type = TRACING_SENDRECV; extra->src = src_traced; @@ -1300,32 +1050,31 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, 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,sendcount*smpi_datatype_size(sendtype)); + TRACE_smpi_send(rank, rank, dst_traced, sendtag,sendcount*smpi_datatype_size(sendtype)); - smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, - recvcount, recvtype, src, recvtag, comm, status); - retval = MPI_SUCCESS; + smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, + status); + retval = MPI_SUCCESS; TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank, recvtag); } smpi_bench_begin(); return retval; } -int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, - MPI_Comm comm, MPI_Status * status) +int PMPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, + MPI_Comm comm, MPI_Status* status) { - void *recvbuf; int retval = 0; if (!is_datatype_valid(datatype)) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count < 0) { - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { int size = smpi_datatype_get_extent(datatype) * count; - recvbuf = xbt_new0(char, size); + 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); @@ -1347,7 +1096,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) smpi_empty_status(status); retval = MPI_SUCCESS; } else { - int rank = (request!=nullptr && (*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; @@ -1451,6 +1200,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) int src_traced = (*request)->src; int dst_traced = (*request)->dst; + int tag_traced= (*request)->tag; MPI_Comm comm = (*request)->comm; int is_wait_for_receive = (*request)->recv; instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); @@ -1465,9 +1215,9 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) if (is_wait_for_receive) { if(src_traced==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUS_IGNORE) ? - smpi_group_rank(smpi_comm_group(comm), status->MPI_SOURCE) : + comm->group()->rank(status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(rank, src_traced, dst_traced); + TRACE_smpi_recv(rank, src_traced, dst_traced, tag_traced); } } @@ -1482,22 +1232,21 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta smpi_bench_end(); //save requests information for tracing - int i; - int *srcs = nullptr, *dsts = nullptr, *recvs = nullptr; - MPI_Comm* comms = nullptr; + typedef struct { + int src; + int dst; + int recv; + int tag; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=nullptr; if(count>0){ - srcs = xbt_new0(int, count); - dsts = xbt_new0(int, count); - recvs = xbt_new0(int, count); - comms = xbt_new0(MPI_Comm, count); + savedvals = xbt_new0(savedvalstype, count); } - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { MPI_Request req = requests[i]; //already received requests are no longer valid if (req) { - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, req->comm}; } } int rank_traced = smpi_process_index(); @@ -1509,23 +1258,20 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta *index = smpi_mpi_waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - int src_traced = srcs[*index]; + int src_traced = savedvals[*index].src; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int dst_traced = dsts[*index]; - int is_wait_for_receive = recvs[*index]; + int dst_traced = savedvals[*index].dst; + int is_wait_for_receive = savedvals[*index].recv; if (is_wait_for_receive) { - if(srcs[*index]==MPI_ANY_SOURCE) - src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) : srcs[*index]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + if(savedvals[*index].src==MPI_ANY_SOURCE) + src_traced = (status != MPI_STATUSES_IGNORE) + ? savedvals[*index].comm->group()->rank(status->MPI_SOURCE) + : savedvals[*index].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced, savedvals[*index].tag); } TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__); } - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(comms); - + xbt_free(savedvals); smpi_bench_begin(); return MPI_SUCCESS; @@ -1535,23 +1281,22 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { smpi_bench_end(); //save information from requests - int i; - int *srcs = xbt_new0(int, count); - int *dsts = xbt_new0(int, count); - int *recvs = xbt_new0(int, count); - int *valid = xbt_new0(int, count); - MPI_Comm *comms = xbt_new0(MPI_Comm, count); - - for (i = 0; i < count; i++) { + typedef struct { + int src; + int dst; + int recv; + int tag; + int valid; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=xbt_new0(savedvalstype, count); + + for (int i = 0; i < count; i++) { MPI_Request req = requests[i]; if(req!=MPI_REQUEST_NULL){ - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; - valid[i]=1;; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, 1, req->comm}; }else{ - valid[i]=0; + savedvals[i].valid=0; } } int rank_traced = smpi_process_index(); @@ -1562,26 +1307,22 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int retval = smpi_mpi_waitall(count, requests, status); - for (i = 0; i < count; i++) { - if(valid[i]){ + for (int i = 0; i < count; i++) { + if(savedvals[i].valid){ //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced = srcs[i]; - int dst_traced = dsts[i]; - int is_wait_for_receive = recvs[i]; + int src_traced = savedvals[i].src; + int dst_traced = savedvals[i].dst; + int is_wait_for_receive = savedvals[i].recv; if (is_wait_for_receive) { if(src_traced==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[i]), status[i].MPI_SOURCE) : srcs[i]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + savedvals[i].comm->group()->rank(status[i].MPI_SOURCE) : savedvals[i].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced,savedvals[i].tag); } } } TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__); - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(valid); - xbt_free(comms); + xbt_free(savedvals); smpi_bench_begin(); return retval; @@ -1606,15 +1347,15 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indic { int retval = 0; - smpi_bench_end(); - if (outcount == nullptr) { - retval = MPI_ERR_ARG; - } else { - *outcount = smpi_mpi_testsome(incount, requests, indices, status); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - return retval; + smpi_bench_end(); + if (outcount == nullptr) { + retval = MPI_ERR_ARG; + } else { + *outcount = smpi_mpi_testsome(incount, requests, indices, status); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; } @@ -1627,28 +1368,27 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (!is_datatype_valid(datatype)) { - retval = MPI_ERR_ARG; + retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); + 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_BCAST; - extra->root = root_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = count*dt_size_send; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); - if(smpi_comm_size(comm)>1) - mpi_coll_bcast_fun(buf, count, datatype, root, comm); - retval = MPI_SUCCESS; + instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); + extra->type = TRACING_BCAST; + extra->root = root_traced; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(datatype); + 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); + retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } - smpi_bench_begin(); return retval; } @@ -1662,15 +1402,15 @@ int PMPI_Barrier(MPI_Comm comm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - 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); + 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); - retval = MPI_SUCCESS; + mpi_coll_barrier_fun(comm); + retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); @@ -1687,42 +1427,42 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || - ((smpi_comm_rank(comm) == root) && (recvtype == MPI_DATATYPE_NULL))){ + ((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL))){ retval = MPI_ERR_TYPE; - } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || ((smpi_comm_rank(comm) == root) && (recvcount <0))){ + } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || ((comm->rank() == root) && (recvcount <0))){ retval = MPI_ERR_COUNT; } else { char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; - if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { + if( (comm->rank() == root) && (sendbuf == MPI_IN_PLACE )) { sendtmpcount=0; sendtmptype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_GATHER; - extra->root = root_traced; - int known=0; - extra->datatype1 = encode_datatype(sendtmptype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(sendtmptype); - extra->send_size = sendtmpcount*dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if((smpi_comm_rank(comm)==root) && known==0) - dt_size_recv = smpi_datatype_size(recvtype); - extra->recv_size = recvcount*dt_size_recv; + 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->root = root_traced; + int known = 0; + extra->datatype1 = encode_datatype(sendtmptype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(sendtmptype); + 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); + extra->recv_size = recvcount * dt_size_recv; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); - mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); + mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); - retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + retval = MPI_SUCCESS; + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -1739,7 +1479,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || - ((smpi_comm_rank(comm) == root) && (recvtype == MPI_DATATYPE_NULL))){ + ((comm->rank() == root) && (recvtype == MPI_DATATYPE_NULL))){ retval = MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ retval = MPI_ERR_COUNT; @@ -1749,39 +1489,39 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; - if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { + if( (comm->rank() == root) && (sendbuf == MPI_IN_PLACE )) { sendtmpcount=0; sendtmptype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - int i=0; - int size = smpi_comm_size(comm); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_GATHERV; - extra->num_processes = size; - extra->root = root_traced; - int known=0; - extra->datatype1 = encode_datatype(sendtmptype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(sendtype); - 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); - if((smpi_comm_rank(comm)==root)){ - 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, root_traced, __FUNCTION__,extra); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = comm->group()->index(root); + int i = 0; + int size = comm->size(); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); + extra->type = TRACING_GATHERV; + extra->num_processes = size; + extra->root = root_traced; + int known = 0; + extra->datatype1 = encode_datatype(sendtmptype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(sendtype); + 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); + if ((comm->rank() == root)) { + 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, root_traced, __FUNCTION__, extra); - smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); + smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -1805,30 +1545,30 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, retval = MPI_ERR_COUNT; } else { if(sendbuf == MPI_IN_PLACE) { - sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*smpi_comm_rank(comm); + sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*comm->rank(); sendcount=recvcount; sendtype=recvtype; } - 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); - 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); - extra->recv_size = recvcount*dt_size_recv; + 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); + 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); + extra->recv_size = recvcount * dt_size_recv; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); + mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -1843,8 +1583,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || - (recvtype == MPI_DATATYPE_NULL)){ + } 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)){ retval = MPI_ERR_COUNT; @@ -1853,35 +1592,35 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } else { if(sendbuf == MPI_IN_PLACE) { - sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*displs[smpi_comm_rank(comm)]; - sendcount=recvcounts[smpi_comm_rank(comm)]; + sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*displs[comm->rank()]; + sendcount=recvcounts[comm->rank()]; sendtype=recvtype; } - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int i=0; - int size = smpi_comm_size(comm); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLGATHERV; - extra->num_processes = size; - int known=0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(sendtype); - 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); - 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; + 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->type = TRACING_ALLGATHERV; + extra->num_processes = size; + int known = 0; + extra->datatype1 = encode_datatype(sendtype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(sendtype); + 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); + 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); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); mpi_coll_allgatherv_fun(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); @@ -1897,39 +1636,39 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (((smpi_comm_rank(comm)==root) && (!is_datatype_valid(sendtype))) - || ((recvbuf !=MPI_IN_PLACE) && (!is_datatype_valid(recvtype)))){ + } else if (((comm->rank() == root) && (!is_datatype_valid(sendtype))) || + ((recvbuf != MPI_IN_PLACE) && (!is_datatype_valid(recvtype)))) { retval = MPI_ERR_TYPE; } else if ((sendbuf == recvbuf) || - ((smpi_comm_rank(comm)==root) && sendcount>0 && (sendbuf == nullptr))){ + ((comm->rank()==root) && sendcount>0 && (sendbuf == nullptr))){ retval = MPI_ERR_BUFFER; }else { if (recvbuf == MPI_IN_PLACE) { - recvtype=sendtype; - recvcount=sendcount; + recvtype = sendtype; + recvcount = sendcount; } - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SCATTER; - extra->root = root_traced; - int known=0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if((smpi_comm_rank(comm)==root) && known==0) - dt_size_send = smpi_datatype_size(sendtype); - 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); - extra->recv_size = recvcount*dt_size_recv; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); + 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->root = root_traced; + int known = 0; + extra->datatype1 = encode_datatype(sendtype, &known); + int dt_size_send = 1; + if ((comm->rank() == root) && known == 0) + dt_size_send = smpi_datatype_size(sendtype); + 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); + 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); + mpi_coll_scatter_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -1947,43 +1686,43 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, retval = MPI_ERR_COMM; } else if (sendcounts == nullptr || displs == nullptr) { retval = MPI_ERR_ARG; - } else if (((smpi_comm_rank(comm)==root) && (sendtype == MPI_DATATYPE_NULL)) - || ((recvbuf !=MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { + } else if (((comm->rank() == root) && (sendtype == MPI_DATATYPE_NULL)) || + ((recvbuf != MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { retval = MPI_ERR_TYPE; } else { if (recvbuf == MPI_IN_PLACE) { - recvtype=sendtype; - recvcount=sendcounts[smpi_comm_rank(comm)]; + recvtype = sendtype; + recvcount = sendcounts[comm->rank()]; } - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - int i=0; - int size = smpi_comm_size(comm); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SCATTERV; - extra->num_processes = size; - extra->root = root_traced; - int known=0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(sendtype); - if((smpi_comm_rank(comm)==root)){ - extra->sendcounts= xbt_new(int, size); - for(i=0; i< size; i++)//copy data to avoid bad free - extra->sendcounts[i] = sendcounts[i]*dt_size_send; - } - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if(known==0) - dt_size_recv = smpi_datatype_size(recvtype); - extra->recv_size = recvcount*dt_size_recv; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = comm->group()->index(root); + int i = 0; + int size = comm->size(); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); + extra->type = TRACING_SCATTERV; + extra->num_processes = size; + extra->root = root_traced; + int known = 0; + extra->datatype1 = encode_datatype(sendtype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(sendtype); + if ((comm->rank() == root)) { + extra->sendcounts = xbt_new(int, size); + for (i = 0; i < size; i++) // copy data to avoid bad free + extra->sendcounts[i] = sendcounts[i] * dt_size_send; + } + extra->datatype2 = encode_datatype(recvtype, &known); + int dt_size_recv = 1; + if (known == 0) + dt_size_recv = smpi_datatype_size(recvtype); + 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 = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -2001,24 +1740,24 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (!is_datatype_valid(datatype) || op == MPI_OP_NULL) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_REDUCE; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = count*dt_size_send; - extra->root = root_traced; + 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; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(datatype); + extra->send_size = count * dt_size_send; + extra->root = root_traced; - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); - mpi_coll_reduce_fun(sendbuf, recvbuf, count, datatype, op, root, comm); + mpi_coll_reduce_fun(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -2028,15 +1767,15 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op){ int retval = 0; - smpi_bench_end(); - if (!is_datatype_valid(datatype) || op == MPI_OP_NULL) { - retval = MPI_ERR_ARG; - } else { - smpi_op_apply(op, inbuf, inoutbuf, &count, &datatype); - retval=MPI_SUCCESS; - } - smpi_bench_begin(); - return retval; + smpi_bench_end(); + if (!is_datatype_valid(datatype) || op == MPI_OP_NULL) { + retval = MPI_ERR_ARG; + } else { + smpi_op_apply(op, inbuf, inoutbuf, &count, &datatype); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; } int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) @@ -2058,25 +1797,25 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp sendtmpbuf = static_cast(xbt_malloc(count*smpi_datatype_get_extent(datatype))); smpi_datatype_copy(recvbuf, count, datatype,sendtmpbuf, count, datatype); } - 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); - extra->send_size = count*dt_size_send; + 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); + extra->send_size = count * dt_size_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - mpi_coll_allreduce_fun(sendtmpbuf, recvbuf, count, datatype, op, comm); + mpi_coll_allreduce_fun(sendtmpbuf, recvbuf, count, datatype, op, comm); if( sendbuf == MPI_IN_PLACE ) xbt_free(sendtmpbuf); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); @@ -2096,22 +1835,22 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - 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); - extra->send_size = count*dt_size_send; + 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); + extra->send_size = count * dt_size_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm); + smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm); - retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + retval = MPI_SUCCESS; + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); @@ -2130,20 +1869,27 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - 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); - extra->send_size = count*dt_size_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); + 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); + extra->send_size = count * dt_size_send; + void* sendtmpbuf = sendbuf; + if (sendbuf == MPI_IN_PLACE) { + sendtmpbuf = static_cast(xbt_malloc(count * smpi_datatype_size(datatype))); + memcpy(sendtmpbuf, recvbuf, count * smpi_datatype_size(datatype)); + } + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - smpi_mpi_exscan(sendbuf, recvbuf, count, datatype, op, comm); + smpi_mpi_exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + if (sendbuf == MPI_IN_PLACE) + xbt_free(sendtmpbuf); } smpi_bench_begin(); @@ -2164,30 +1910,38 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int i=0; - int size = smpi_comm_size(comm); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_REDUCE_SCATTER; - extra->num_processes = size; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = 0; - 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_send; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); - - void* sendtmpbuf=sendbuf; - if(sendbuf==MPI_IN_PLACE) - sendtmpbuf=recvbuf; - - mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); + 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->type = TRACING_REDUCE_SCATTER; + extra->num_processes = size; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(datatype); + extra->send_size = 0; + extra->recvcounts = xbt_new(int, size); + int totalcount = 0; + for (i = 0; i < size; i++) { // copy data to avoid bad free + extra->recvcounts[i] = recvcounts[i] * dt_size_send; + totalcount += recvcounts[i]; + } + void* sendtmpbuf = sendbuf; + if (sendbuf == MPI_IN_PLACE) { + sendtmpbuf = static_cast(xbt_malloc(totalcount * smpi_datatype_size(datatype))); + memcpy(sendtmpbuf, recvbuf, totalcount * smpi_datatype_size(datatype)); + } + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + + mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + + if (sendbuf == MPI_IN_PLACE) + xbt_free(sendtmpbuf); } smpi_bench_begin(); @@ -2197,7 +1951,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { - int retval,i; + int retval; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -2209,78 +1963,99 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, } else if (recvcount < 0) { retval = MPI_ERR_ARG; } else { - int count=smpi_comm_size(comm); + int count = comm->size(); - 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; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = 0; - extra->recvcounts= xbt_new(int, count); - for(i=0; i< count; i++)//copy data to avoid bad free - extra->recvcounts[i] = recvcount*dt_size_send; - - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); - - int* recvcounts=static_cast(xbt_malloc(count)); - for (i=0; itype = TRACING_REDUCE_SCATTER; + extra->num_processes = count; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) + dt_size_send = smpi_datatype_size(datatype); + 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(xbt_malloc(recvcount * count * smpi_datatype_size(datatype))); + memcpy(sendtmpbuf, recvbuf, recvcount * count * smpi_datatype_size(datatype)); + } + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + + int* recvcounts = static_cast(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); xbt_free(recvcounts); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + + if (sendbuf == MPI_IN_PLACE) + xbt_free(sendtmpbuf); } smpi_bench_begin(); return retval; } -int PMPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) +int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, MPI_Comm comm) { int retval = 0; - smpi_bench_end(); if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } 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; - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLTOALL; - int known=0; - extra->datatype1 = encode_datatype(sendtype, &known); - if(known==0) - extra->send_size = sendcount*smpi_datatype_size(sendtype); - else - extra->send_size = sendcount; - extra->datatype2 = encode_datatype(recvtype, &known); - if(known==0) - extra->recv_size = recvcount*smpi_datatype_size(recvtype); - else - extra->recv_size = recvcount; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); + 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; - retval = mpi_coll_alltoall_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); + void* sendtmpbuf = static_cast(sendbuf); + int sendtmpcount = sendcount; + MPI_Datatype sendtmptype = sendtype; + if (sendbuf == MPI_IN_PLACE) { + sendtmpbuf = static_cast(xbt_malloc(recvcount * comm->size() * smpi_datatype_size(recvtype))); + memcpy(sendtmpbuf, recvbuf, recvcount * comm->size() * smpi_datatype_size(recvtype)); + sendtmpcount = recvcount; + sendtmptype = recvtype; + } - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + int known = 0; + extra->datatype1 = encode_datatype(sendtmptype, &known); + if (known == 0) + extra->send_size = sendtmpcount * smpi_datatype_size(sendtmptype); + else + extra->send_size = sendtmpcount; + extra->datatype2 = encode_datatype(recvtype, &known); + if (known == 0) + extra->recv_size = recvcount * smpi_datatype_size(recvtype); + 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); + + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + + if (sendbuf == MPI_IN_PLACE) + xbt_free(sendtmpbuf); } smpi_bench_begin(); return retval; } -int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype sendtype, void *recvbuf, int *recvcounts, - int *recvdisps, MPI_Datatype recvtype, MPI_Comm comm) +int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, + int* recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) { int retval = 0; @@ -2290,40 +2065,65 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype s retval = MPI_ERR_COMM; } else if (sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (sendcounts == nullptr || senddisps == nullptr || recvcounts == nullptr || recvdisps == nullptr) { + } else if ((sendbuf != MPI_IN_PLACE && (sendcounts == nullptr || senddisps == nullptr)) || recvcounts == nullptr || + recvdisps == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int i=0; - int size = smpi_comm_size(comm); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ALLTOALLV; - extra->send_size = 0; - extra->recv_size = 0; - extra->recvcounts= xbt_new(int, size); - extra->sendcounts= xbt_new(int, size); - int known=0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = smpi_datatype_size(sendtype); - int dt_size_recv = 1; - extra->datatype2 = encode_datatype(recvtype, &known); - if(known==0) - dt_size_recv = smpi_datatype_size(recvtype); - for(i=0; i< size; i++){//copy data to avoid bad free - extra->send_size += sendcounts[i]*dt_size_send; - extra->recv_size += recvcounts[i]*dt_size_recv; + 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->type = TRACING_ALLTOALLV; + extra->send_size = 0; + extra->recv_size = 0; + extra->recvcounts = xbt_new(int, size); + extra->sendcounts = xbt_new(int, size); + int known = 0; + int dt_size_recv = 1; + extra->datatype2 = encode_datatype(recvtype, &known); + dt_size_recv = smpi_datatype_size(recvtype); - extra->sendcounts[i] = sendcounts[i]*dt_size_send; - extra->recvcounts[i] = recvcounts[i]*dt_size_recv; - } - extra->num_processes = size; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); + void* sendtmpbuf = static_cast(sendbuf); + int* sendtmpcounts = sendcounts; + int* sendtmpdisps = senddisps; + MPI_Datatype sendtmptype = sendtype; + int maxsize = 0; + for (i = 0; i < size; i++) { // copy data to avoid bad free + extra->recv_size += recvcounts[i] * dt_size_recv; + extra->recvcounts[i] = recvcounts[i] * dt_size_recv; + if (((recvdisps[i] + recvcounts[i]) * dt_size_recv) > maxsize) + maxsize = (recvdisps[i] + recvcounts[i]) * dt_size_recv; + } - retval = mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, - comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + if (sendbuf == MPI_IN_PLACE) { + sendtmpbuf = static_cast(xbt_malloc(maxsize)); + memcpy(sendtmpbuf, recvbuf, maxsize); + sendtmpcounts = static_cast(xbt_malloc(size * sizeof(int))); + memcpy(sendtmpcounts, recvcounts, size * sizeof(int)); + sendtmpdisps = static_cast(xbt_malloc(size * sizeof(int))); + memcpy(sendtmpdisps, recvdisps, size * sizeof(int)); + sendtmptype = recvtype; + } + + extra->datatype1 = encode_datatype(sendtmptype, &known); + int dt_size_send = 1; + dt_size_send = smpi_datatype_size(sendtmptype); + + for (i = 0; i < size; i++) { // copy data to avoid bad free + extra->send_size += sendtmpcounts[i] * dt_size_send; + extra->sendcounts[i] = 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, + recvdisps, recvtype, comm); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + + if (sendbuf == MPI_IN_PLACE) { + xbt_free(sendtmpbuf); + xbt_free(sendtmpcounts); + xbt_free(sendtmpdisps); + } } smpi_bench_begin(); @@ -2333,87 +2133,71 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype s int PMPI_Get_processor_name(char *name, int *resultlen) { - int retval = MPI_SUCCESS; - - strncpy(name, sg_host_get_name(SIMIX_host_self()), - strlen(sg_host_get_name(SIMIX_host_self())) < MPI_MAX_PROCESSOR_NAME - 1 ? - strlen(sg_host_get_name(SIMIX_host_self())) +1 : MPI_MAX_PROCESSOR_NAME - 1 ); + strncpy(name, SIMIX_host_self()->cname(), strlen(SIMIX_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1 + ? strlen(SIMIX_host_self()->cname()) + 1 + : MPI_MAX_PROCESSOR_NAME - 1); *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); - return retval; + return MPI_SUCCESS; } int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count) { - int retval = MPI_SUCCESS; - size_t size; - if (status == nullptr || count == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else if (!is_datatype_valid(datatype)) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else { - size = smpi_datatype_size(datatype); + size_t size = smpi_datatype_size(datatype); if (size == 0) { *count = 0; + return MPI_SUCCESS; } else if (status->count % size != 0) { - retval = MPI_UNDEFINED; + return MPI_UNDEFINED; } else { *count = smpi_mpi_get_count(status, datatype); + return MPI_SUCCESS; } } - return retval; } int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_contiguous(count, old_type, new_type, 0); + return smpi_datatype_contiguous(count, old_type, new_type, 0); } - return retval; } int PMPI_Type_commit(MPI_Datatype* datatype) { - int retval = 0; - if (datatype == nullptr || *datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else { smpi_datatype_commit(datatype); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0 || blocklen<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_vector(count, blocklen, stride, old_type, new_type); + return smpi_datatype_vector(count, blocklen, stride, old_type, new_type); } - return retval; } int PMPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0 || blocklen<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_hvector(count, blocklen, stride, old_type, new_type); + return smpi_datatype_hvector(count, blocklen, stride, old_type, new_type); } - return retval; } int PMPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) { @@ -2421,60 +2205,51 @@ int PMPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datat } int PMPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); + return smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); } - return retval; } int PMPI_Type_create_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); + return smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); } - return retval; } int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI_Datatype old_type, - MPI_Datatype* new_type) { - int retval,i; - + MPI_Datatype* new_type) +{ if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - int* blocklens=static_cast(xbt_malloc(blocklength*count)); - for (i=0; i(xbt_malloc(blocklength*count*sizeof(int))); + for (int i = 0; i < count; i++) blocklens[i]=blocklength; - retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); + int retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); xbt_free(blocklens); + return retval; } - return retval; } -int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval = 0; - +int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) +{ if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - retval = smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type); + return smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type); } - return retval; } int PMPI_Type_create_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, @@ -2484,30 +2259,26 @@ int PMPI_Type_create_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_ int PMPI_Type_create_hindexed_block(int count, int blocklength, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval,i; - if (old_type == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (count<0){ - retval = MPI_ERR_COUNT; + return MPI_ERR_COUNT; } else { - int* blocklens=(int*)xbt_malloc(blocklength*count); - for (i=0; i 0 && (dims == nullptr || periodic == nullptr)) || comm_cart == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else{ - retval = smpi_mpi_cart_create(comm_old, ndims, dims, periodic, reorder, comm_cart); + return smpi_mpi_cart_create(comm_old, ndims, dims, periodic, reorder, comm_cart); } - return retval; } int PMPI_Cart_rank(MPI_Comm comm, int* coords, int* rank) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { + if(comm == MPI_COMM_NULL || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } if (coords == nullptr) { @@ -2553,7 +2322,7 @@ int PMPI_Cart_rank(MPI_Comm comm, int* coords, int* rank) { } int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* dest) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { + if(comm == MPI_COMM_NULL || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } if (source == nullptr || dest == nullptr || direction < 0 ) { @@ -2563,10 +2332,10 @@ int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* d } int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { + if(comm == MPI_COMM_NULL || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } - if (rank < 0 || rank >= smpi_comm_size(comm)) { + if (rank < 0 || rank >= comm->size()) { return MPI_ERR_RANK; } if (maxdims <= 0) { @@ -2579,7 +2348,7 @@ int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { } int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords) { - if(comm == nullptr || smpi_comm_topo(comm) == nullptr) { + if(comm == nullptr || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } if(maxdims <= 0 || dims == nullptr || periods == nullptr || coords == nullptr) { @@ -2589,7 +2358,7 @@ int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coor } int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) { - if (comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { + if (comm == MPI_COMM_NULL || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } if (ndims == nullptr) { @@ -2610,7 +2379,7 @@ int PMPI_Dims_create(int nnodes, int ndims, int* dims) { } int PMPI_Cart_sub(MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { + if(comm == MPI_COMM_NULL || comm->topo() == nullptr) { return MPI_ERR_TOPOLOGY; } if (comm_new == nullptr) { @@ -2620,18 +2389,18 @@ int PMPI_Cart_sub(MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new) { } int PMPI_Type_create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){ - if(oldtype == MPI_DATATYPE_NULL) { - return MPI_ERR_TYPE; - } - int blocks[3] = { 1, 1, 1 }; - MPI_Aint disps[3] = { lb, 0, lb+extent }; - MPI_Datatype types[3] = { MPI_LB, oldtype, MPI_UB }; + if (oldtype == MPI_DATATYPE_NULL) { + return MPI_ERR_TYPE; + } + int blocks[3] = {1, 1, 1}; + 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); + 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)->flags &= ~DT_FLAG_COMMITED; - return MPI_SUCCESS; + (*newtype)->flags &= ~DT_FLAG_COMMITED; + return MPI_SUCCESS; } int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){ @@ -2663,44 +2432,38 @@ int PMPI_Win_free( MPI_Win* win){ int PMPI_Win_set_name(MPI_Win win, char * name) { - int retval = 0; if (win == MPI_WIN_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (name == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { smpi_mpi_win_set_name(win, name); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Win_get_name(MPI_Win win, char * name, int* len) { - int retval = MPI_SUCCESS; - if (win == MPI_WIN_NULL) { - retval = MPI_ERR_WIN; + return MPI_ERR_WIN; } else if (name == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { smpi_mpi_win_get_name(win, name, len); + return MPI_SUCCESS; } - return retval; } int PMPI_Win_get_group(MPI_Win win, MPI_Group * group){ - int retval = MPI_SUCCESS; if (win == MPI_WIN_NULL) { - retval = MPI_ERR_WIN; + return MPI_ERR_WIN; }else { smpi_mpi_win_get_group(win, group); - smpi_group_use(*group); + (*group)->use(); + return MPI_SUCCESS; } - return retval; } - int PMPI_Win_fence( int assert, MPI_Win win){ int retval = 0; smpi_bench_end(); @@ -2727,7 +2490,7 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, } else if (target_rank <0){ retval = MPI_ERR_RANK; } else if (target_disp <0){ - retval = MPI_ERR_ARG; + retval = MPI_ERR_ARG; } else if ((origin_count < 0 || target_count < 0) || (origin_addr==nullptr && origin_count > 0)){ retval = MPI_ERR_COUNT; @@ -2737,7 +2500,7 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int rank = smpi_process_index(); MPI_Group group; smpi_mpi_win_get_group(win, &group); - int src_traced = smpi_group_index(group, target_rank); + int src_traced = group->index(target_rank); TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, nullptr); retval = smpi_mpi_get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, @@ -2770,9 +2533,9 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int rank = smpi_process_index(); MPI_Group group; smpi_mpi_win_get_group(win, &group); - int dst_traced = smpi_group_index(group, target_rank); + int dst_traced = group->index(target_rank); TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, nullptr); - TRACE_smpi_send(rank, rank, dst_traced, origin_count*smpi_datatype_size(origin_datatype)); + TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*smpi_datatype_size(origin_datatype)); retval = smpi_mpi_put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win); @@ -2807,7 +2570,7 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da int rank = smpi_process_index(); MPI_Group group; smpi_mpi_win_get_group(win, &group); - int src_traced = smpi_group_index(group, target_rank); + int src_traced = group->index(target_rank); TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, nullptr); retval = smpi_mpi_accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, @@ -2826,8 +2589,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ retval = MPI_ERR_WIN; } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; - } - else { + } else { int rank = smpi_process_index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_post(group,assert,win); @@ -2844,8 +2606,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ retval = MPI_ERR_WIN; } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; - } - else { + } else { int rank = smpi_process_index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_start(group,assert,win); @@ -2860,8 +2621,7 @@ int PMPI_Win_complete(MPI_Win win){ smpi_bench_end(); if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; - } - else { + } else { int rank = smpi_process_index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); @@ -2878,8 +2638,7 @@ int PMPI_Win_wait(MPI_Win win){ smpi_bench_end(); if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; - } - else { + } else { int rank = smpi_process_index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); @@ -2908,31 +2667,26 @@ int PMPI_Free_mem(void *baseptr){ int PMPI_Type_set_name(MPI_Datatype datatype, char * name) { - int retval = 0; if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (name == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { smpi_datatype_set_name(datatype, name); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } int PMPI_Type_get_name(MPI_Datatype datatype, char * name, int* len) { - int retval = 0; - if (datatype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; + return MPI_ERR_TYPE; } else if (name == nullptr) { - retval = MPI_ERR_ARG; + return MPI_ERR_ARG; } else { smpi_datatype_get_name(datatype, name, len); - retval = MPI_SUCCESS; + return MPI_SUCCESS; } - return retval; } MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype){ @@ -3006,7 +2760,7 @@ int PMPI_Attr_delete(MPI_Comm comm, int keyval) { else if (comm==MPI_COMM_NULL) return MPI_ERR_COMM; else - return smpi_comm_attr_delete(comm, keyval); + return comm->attr_delete(keyval); } int PMPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) { @@ -3044,7 +2798,7 @@ int PMPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) { *static_cast(attr_value) = &one; return MPI_SUCCESS; default: - return smpi_comm_attr_get(comm, keyval, attr_value, flag); + return comm->attr_get(keyval, attr_value, flag); } } @@ -3055,7 +2809,7 @@ int PMPI_Attr_put(MPI_Comm comm, int keyval, void* attr_value) { else if (comm==MPI_COMM_NULL) return MPI_ERR_COMM; else - return smpi_comm_attr_put(comm, keyval, attr_value); + return comm->attr_put(keyval, attr_value); } int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag) @@ -3168,10 +2922,10 @@ int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ (*newinfo)->info_dict= xbt_dict_new_homogeneous(xbt_free_f); (*newinfo)->refcount=1; xbt_dict_cursor_t cursor = nullptr; - int *key; + char* key; void* data; xbt_dict_foreach(info->info_dict,cursor,key,data){ - xbt_dict_set((*newinfo)->info_dict, reinterpret_cast(key), xbt_strdup(reinterpret_cast(data)), nullptr); + xbt_dict_set((*newinfo)->info_dict, key, xbt_strdup(static_cast(data)), nullptr); } return MPI_SUCCESS; } @@ -3259,3 +3013,4 @@ int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) return MPI_SUCCESS; } +} // extern "C"