X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43f7ca1cac5ab1858e318fdd6239d0a0c3b3d893..fbcf6ab31cae1988be858f9f894dafe529c575d7:/src/smpi/mpi/smpi_group.cpp diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp index 115cf49a17..68d86f8032 100644 --- a/src/smpi/mpi/smpi_group.cpp +++ b/src/smpi/mpi/smpi_group.cpp @@ -1,10 +1,13 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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 "smpi_comm.hpp" +#include "simgrid/s4u/Actor.hpp" #include "smpi_group.hpp" +#include "smpi_comm.hpp" +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)"); @@ -14,91 +17,57 @@ MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY; namespace simgrid{ namespace smpi{ -Group::Group() -{ - size_=0; /* size */ - rank_to_index_map_=nullptr; /* rank_to_index_map_ */ - index_to_rank_map_=nullptr; /* index_to_rank_map_ */ - refcount_=1; /* refcount_: start > 0 so that this group never gets freed */ -} - -Group::Group(int n) : size_(n) +Group::Group(Group* origin) { - rank_to_index_map_ = xbt_new(int, size_); - index_to_rank_map_ = xbt_dict_new_homogeneous(xbt_free_f); - refcount_ = 1; - for (int i = 0; i < size_; i++) { - rank_to_index_map_[i] = MPI_UNDEFINED; + if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) { + size_ = origin->size(); + // FIXME: cheinrich: There is no such thing as an index any more; the two maps should be removed + index_to_rank_map_ = origin->index_to_rank_map_; + rank_to_actor_map_ = origin->rank_to_actor_map_; + actor_to_rank_map_ = origin->actor_to_rank_map_; } } -Group::Group(MPI_Group origin) +void Group::set_mapping(s4u::ActorPtr actor, int rank) { - if(origin != MPI_GROUP_NULL - && origin != MPI_GROUP_EMPTY) - { - size_ = origin->size(); - rank_to_index_map_ = xbt_new(int, size_); - index_to_rank_map_ = xbt_dict_new_homogeneous(xbt_free_f); - refcount_ = 1; - for (int i = 0; i < size_; i++) { - rank_to_index_map_[i] = origin->rank_to_index_map_[i]; - } - - char* key; - char* ptr_rank; - xbt_dict_cursor_t cursor = nullptr; - xbt_dict_foreach(origin->index_to_rank_map_, cursor, key, ptr_rank) { - int * cp = static_cast(xbt_malloc(sizeof(int))); - *cp=*reinterpret_cast(ptr_rank); - xbt_dict_set(index_to_rank_map_, key, cp, nullptr); - } + if (0 <= rank && rank < size_) { + int index = actor->get_pid(); + if (index != MPI_UNDEFINED) { + if ((unsigned)index >= index_to_rank_map_.size()) + index_to_rank_map_.resize(index + 1, MPI_UNDEFINED); + index_to_rank_map_[index] = rank; } -} -Group::~Group() -{ - xbt_free(rank_to_index_map_); - xbt_dict_free(&index_to_rank_map_); -} - -void Group::set_mapping(int index, int rank) -{ - if (rank < size_) { - rank_to_index_map_[rank] = index; - if (index!=MPI_UNDEFINED ) { - int* val_rank = static_cast(xbt_malloc(sizeof(int))); - *val_rank = rank; - - char * key = bprintf("%d", index); - xbt_dict_set(index_to_rank_map_, key, val_rank, nullptr); - xbt_free(key); + rank_to_actor_map_[rank] = actor; + if (actor != nullptr) { + actor_to_rank_map_.insert({actor, rank}); } } } -int Group::index(int rank) +int Group::rank(int index) { - int index = MPI_UNDEFINED; + int rank; + if (0 <= index && (unsigned)index < index_to_rank_map_.size()) + rank = index_to_rank_map_[index]; + else + rank = MPI_UNDEFINED; - if (0 <= rank && rank < size_) { - index = rank_to_index_map_[rank]; - } - return index; + return rank; } -int Group::rank(int index) +s4u::ActorPtr Group::actor(int rank) { - int * ptr_rank = nullptr; - if (this==MPI_GROUP_EMPTY) - return MPI_UNDEFINED; - char * key = bprintf("%d", index); - ptr_rank = static_cast(xbt_dict_get_or_null(index_to_rank_map_, key)); - xbt_free(key); + if (0 <= rank && rank < size_) + return rank_to_actor_map_[rank]; + else + return nullptr; +} - if (ptr_rank==nullptr) - return MPI_UNDEFINED; - return *ptr_rank; +int Group::rank(const s4u::ActorPtr actor) +{ + auto iterator = actor_to_rank_map_.find(actor); + return (iterator == actor_to_rank_map_.end()) ? MPI_UNDEFINED : (*iterator).second; } void Group::ref() @@ -114,11 +83,6 @@ void Group::unref(Group* group) } } -int Group::size() -{ - return size_; -} - int Group::compare(MPI_Group group2) { int result; @@ -127,10 +91,9 @@ int Group::compare(MPI_Group group2) if (size_ != group2->size()) { result = MPI_UNEQUAL; } else { - int sz = group2->size(); - for (int i = 0; i < sz; i++) { - int index = this->index(i); - int rank = group2->rank(index); + for (int i = 0; i < size_; i++) { + s4u::ActorPtr actor = this->actor(i); + int rank = group2->rank(actor); if (rank == MPI_UNDEFINED) { result = MPI_UNEQUAL; break; @@ -143,23 +106,20 @@ int Group::compare(MPI_Group group2) return result; } -int Group::incl(int n, int* ranks, MPI_Group* newgroup) +int Group::incl(int n, const int* ranks, MPI_Group* newgroup) { int i=0; - int index=0; if (n == 0) { *newgroup = MPI_GROUP_EMPTY; } else if (n == size_) { *newgroup = this; - if(this!= MPI_COMM_WORLD->group() - && this != MPI_COMM_SELF->group() - && this != MPI_GROUP_EMPTY) - this->ref(); + if (this != MPI_COMM_WORLD->group() && this != MPI_COMM_SELF->group() && this != MPI_GROUP_EMPTY) + this->ref(); } else { *newgroup = new Group(n); for (i = 0; i < n; i++) { - index = this->index(ranks[i]); - (*newgroup)->set_mapping(index, i); + s4u::ActorPtr actor = this->actor(ranks[i]); // ranks[] was passed as a param! + (*newgroup)->set_mapping(actor, i); } } return MPI_SUCCESS; @@ -170,8 +130,8 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) int size1 = size_; int size2 = group2->size(); for (int i = 0; i < size2; i++) { - int proc2 = group2->index(i); - int proc1 = this->rank(proc2); + s4u::ActorPtr actor = group2->actor(i); + int proc1 = this->rank(actor); if (proc1 == MPI_UNDEFINED) { size1++; } @@ -182,12 +142,12 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) *newgroup = new Group(size1); size2 = this->size(); for (int i = 0; i < size2; i++) { - int proc1 = this->index(i); - (*newgroup)->set_mapping(proc1, i); + s4u::ActorPtr actor1 = this->actor(i); + (*newgroup)->set_mapping(actor1, i); } for (int i = size2; i < size1; i++) { - int proc2 = group2->index(i - size2); - (*newgroup)->set_mapping(proc2, i); + s4u::ActorPtr actor = group2->actor(i - size2); + (*newgroup)->set_mapping(actor, i); } } return MPI_SUCCESS; @@ -197,8 +157,8 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) { int size2 = group2->size(); for (int i = 0; i < size2; i++) { - int proc2 = group2->index(i); - int proc1 = this->rank(proc2); + s4u::ActorPtr actor = group2->actor(i); + int proc1 = this->rank(actor); if (proc1 == MPI_UNDEFINED) { size2--; } @@ -209,10 +169,10 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) *newgroup = new Group(size2); int j=0; for (int i = 0; i < group2->size(); i++) { - int proc2 = group2->index(i); - int proc1 = this->rank(proc2); + s4u::ActorPtr actor = group2->actor(i); + int proc1 = this->rank(actor); if (proc1 != MPI_UNDEFINED) { - (*newgroup)->set_mapping(proc2, j); + (*newgroup)->set_mapping(actor, j); j++; } } @@ -225,8 +185,8 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) int newsize = size_; int size2 = size_; for (int i = 0; i < size2; i++) { - int proc1 = this->index(i); - int proc2 = group2->rank(proc1); + s4u::ActorPtr actor = this->actor(i); + int proc2 = group2->rank(actor); if (proc2 != MPI_UNDEFINED) { newsize--; } @@ -236,21 +196,21 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) } else { *newgroup = new Group(newsize); for (int i = 0; i < size2; i++) { - int proc1 = this->index(i); - int proc2 = group2->rank(proc1); + s4u::ActorPtr actor = this->actor(i); + int proc2 = group2->rank(actor); if (proc2 == MPI_UNDEFINED) { - (*newgroup)->set_mapping(proc1, i); + (*newgroup)->set_mapping(actor, i); } } } return MPI_SUCCESS; } -int Group::excl(int n, int *ranks, MPI_Group * newgroup){ +int Group::excl(int n, const int *ranks, MPI_Group * newgroup){ int oldsize = size_; int newsize = oldsize - n; *newgroup = new Group(newsize); - int* to_exclude=xbt_new0(int, size_); + int* to_exclude = new int[size_]; for (int i = 0; i < oldsize; i++) to_exclude[i]=0; for (int i = 0; i < n; i++) @@ -258,16 +218,24 @@ int Group::excl(int n, int *ranks, MPI_Group * newgroup){ int j = 0; for (int i = 0; i < oldsize; i++) { if(to_exclude[i]==0){ - int index = this->index(i); - (*newgroup)->set_mapping(index, j); + s4u::ActorPtr actor = this->actor(i); + (*newgroup)->set_mapping(actor, j); j++; } } - xbt_free(to_exclude); + delete[] to_exclude; return MPI_SUCCESS; } +static bool is_rank_in_range(int rank, int first, int last) +{ + if (first < last) + return rank <= last; + else + return rank >= last; +} + int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ int newsize = 0; for (int i = 0; i < n; i++) { @@ -279,13 +247,8 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ break; } rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] < ranges[i][1]) { - if (rank > ranges[i][1]) - break; - } else { - if (rank < ranges[i][1]) - break; - } + if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1])) + break; } } *newgroup = new Group(newsize); @@ -294,20 +257,15 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ for (int rank = ranges[i][0]; /* First */ rank >= 0 && rank < size_; /* Last */ ) { - int index = this->index(rank); - (*newgroup)->set_mapping(index, j); + s4u::ActorPtr actor = this->actor(rank); + (*newgroup)->set_mapping(actor, j); j++; if(rank == ranges[i][1]){/*already last ?*/ break; } rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] < ranges[i][1]) { - if (rank > ranges[i][1]) - break; - } else { - if (rank < ranges[i][1]) - break; - } + if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1])) + break; } } return MPI_SUCCESS; @@ -324,13 +282,8 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ break; } rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] < ranges[i][1]) { - if (rank > ranges[i][1]) - break; - } else { - if (rank < ranges[i][1]) - break; - } + if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1])) + break; } } if (newsize == 0) { @@ -351,18 +304,13 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ break; } rank += ranges[i][2]; /* Stride */ - if (ranges[i][0] ranges[i][1]) - break; - }else{ - if (rank < ranges[i][1]) - break; - } + if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1])) + break; } } if(add==1){ - int index = this->index(oldrank); - (*newgroup)->set_mapping(index, newrank); + s4u::ActorPtr actor = this->actor(oldrank); + (*newgroup)->set_mapping(actor, newrank); newrank++; } oldrank++; @@ -376,7 +324,7 @@ MPI_Group Group::f2c(int id) { return MPI_GROUP_EMPTY; } else if(F2C::f2c_lookup() != nullptr && id >= 0) { char key[KEY_SIZE]; - return static_cast(xbt_dict_get_or_null(F2C::f2c_lookup(), get_key(key, id))); + return static_cast(F2C::f2c_lookup()->at(get_key(key, id))); } else { return static_cast(MPI_GROUP_NULL); }