Group::Group(const Group* origin)
{
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_;
void Group::set_mapping(s4u::Actor* actor, int rank)
{
- if (0 <= rank && rank < size_) {
+ if (0 <= rank && rank < size()) {
int index = actor->get_pid();
if ((unsigned)index >= index_to_rank_map_.size())
index_to_rank_map_.resize(index + 1, MPI_UNDEFINED);
s4u::Actor* Group::actor(int rank) const
{
- if (0 <= rank && rank < size_)
+ if (0 <= rank && rank < size())
return rank_to_actor_map_[rank];
else
return nullptr;
int result;
result = MPI_IDENT;
- if (size_ != group2->size()) {
+ if (size() != group2->size()) {
result = MPI_UNEQUAL;
} else {
- for (int i = 0; i < size_; i++) {
+ for (int i = 0; i < size(); i++) {
int rank = group2->rank(actor(i));
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
{
if (n == 0) {
*newgroup = MPI_GROUP_EMPTY;
- } else {
- *newgroup = new Group(n);
- for (int i = 0; i < n; i++) {
- s4u::Actor* actor = this->actor(ranks[i]); // ranks[] was passed as a param!
- (*newgroup)->set_mapping(actor, i);
- }
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ return MPI_SUCCESS;
}
+
+ *newgroup = new Group(n);
+ for (int i = 0; i < n; i++) {
+ s4u::Actor* actor = this->actor(ranks[i]);
+ (*newgroup)->set_mapping(actor, i);
+ }
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
int Group::group_union(MPI_Group group2, MPI_Group* newgroup) const
{
- int size1 = size_;
- int size2 = group2->size();
- for (int i = 0; i < size2; i++) {
+ std::vector<int> to_incl;
+ for (int i = 0; i < group2->size(); i++) {
s4u::Actor* actor = group2->actor(i);
- int proc1 = this->rank(actor);
- if (proc1 == MPI_UNDEFINED) {
- size1++;
- }
+ if (rank(actor) == MPI_UNDEFINED)
+ to_incl.push_back(i);
}
- if (size1 == 0) {
+
+ int newsize = size() + static_cast<int>(to_incl.size());
+ if (newsize == 0) {
*newgroup = MPI_GROUP_EMPTY;
- } else {
- *newgroup = new Group(size1);
- size2 = this->size();
- for (int i = 0; i < size2; i++) {
- s4u::Actor* actor1 = this->actor(i);
- (*newgroup)->set_mapping(actor1, i);
- }
- for (int i = size2; i < size1; i++) {
- s4u::Actor* actor = group2->actor(i - size2);
- (*newgroup)->set_mapping(actor, i);
- }
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ return MPI_SUCCESS;
+ }
+
+ *newgroup = new Group(newsize);
+ int i;
+ for (i = 0; i < size(); i++) {
+ s4u::Actor* actor1 = actor(i);
+ (*newgroup)->set_mapping(actor1, i);
}
+ for (int j : to_incl) {
+ s4u::Actor* actor2 = group2->actor(j);
+ (*newgroup)->set_mapping(actor2, i);
+ i++;
+ }
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
int Group::intersection(MPI_Group group2, MPI_Group* newgroup) const
{
- int size2 = group2->size();
- for (int i = 0; i < size2; i++) {
+ std::vector<int> to_incl;
+ for (int i = 0; i < group2->size(); i++) {
s4u::Actor* actor = group2->actor(i);
- int proc1 = this->rank(actor);
- if (proc1 == MPI_UNDEFINED) {
- size2--;
- }
+ if (rank(actor) != MPI_UNDEFINED)
+ to_incl.push_back(i);
}
- if (size2 == 0) {
+
+ if (to_incl.empty()) {
*newgroup = MPI_GROUP_EMPTY;
- } else {
- *newgroup = new Group(size2);
- int j=0;
- for (int i = 0; i < group2->size(); i++) {
- s4u::Actor* actor = group2->actor(i);
- int proc1 = this->rank(actor);
- if (proc1 != MPI_UNDEFINED) {
- (*newgroup)->set_mapping(actor, j);
- j++;
- }
- }
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ return MPI_SUCCESS;
}
+
+ int newsize = static_cast<int>(to_incl.size());
+ *newgroup = new Group(newsize);
+ for (int i = 0; i < newsize; i++) {
+ s4u::Actor* actor = group2->actor(to_incl[i]);
+ (*newgroup)->set_mapping(actor, i);
+ }
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
int Group::difference(MPI_Group group2, MPI_Group* newgroup) const
{
- int newsize = size_;
- int size2 = size_;
- for (int i = 0; i < size2; i++) {
+ std::vector<int> to_incl;
+ for (int i = 0; i < size(); i++) {
s4u::Actor* actor = this->actor(i);
- int proc2 = group2->rank(actor);
- if (proc2 != MPI_UNDEFINED) {
- newsize--;
- }
+ if (group2->rank(actor) == MPI_UNDEFINED)
+ to_incl.push_back(i);
}
- if (newsize == 0) {
+
+ if (to_incl.empty()) {
*newgroup = MPI_GROUP_EMPTY;
- } else {
- *newgroup = new Group(newsize);
- for (int i = 0; i < size2; i++) {
- s4u::Actor* actor = this->actor(i);
- int proc2 = group2->rank(actor);
- if (proc2 == MPI_UNDEFINED) {
- (*newgroup)->set_mapping(actor, i);
- }
- }
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ return MPI_SUCCESS;
}
+
+ int newsize = static_cast<int>(to_incl.size());
+ *newgroup = new Group(newsize);
+ for (int i = 0; i < newsize; i++) {
+ s4u::Actor* actor = group2->actor(to_incl[i]);
+ (*newgroup)->set_mapping(actor, i);
+ }
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
int Group::excl(int n, const int* ranks, MPI_Group* newgroup) const
{
- int oldsize = size_;
- int newsize = oldsize - n;
- *newgroup = new Group(newsize);
- std::vector<bool> to_exclude(size_, false);
+ if (n == size()) {
+ *newgroup = MPI_GROUP_EMPTY;
+ return MPI_SUCCESS;
+ }
+
+ std::vector<bool> to_excl(size(), false);
for (int i = 0; i < n; i++)
- to_exclude[ranks[i]] = true;
+ to_excl[ranks[i]] = true;
+
+ int newsize = size() - n;
+ *newgroup = new Group(newsize);
int j = 0;
- for (int i = 0; i < oldsize; i++) {
- if (not to_exclude[i]) {
+ for (int i = 0; i < size(); i++) {
+ if (not to_excl[i]) {
s4u::Actor* actor = this->actor(i);
(*newgroup)->set_mapping(actor, j);
j++;
}
}
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
{
std::vector<int> to_incl;
for (int i = 0; i < n; i++)
- for (int j = ranges[i][0]; j >= 0 && j < size_ && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
+ for (int j = ranges[i][0]; j >= 0 && j < size() && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
j += ranges[i][2])
to_incl.push_back(j);
+ if (to_incl.empty()) {
+ *newgroup = MPI_GROUP_EMPTY;
+ return MPI_SUCCESS;
+ }
+
int newsize = static_cast<int>(to_incl.size());
*newgroup = new Group(newsize);
- for (int j = 0; j < newsize; j++) {
- int rank = to_incl[j];
- s4u::Actor* actor = this->actor(rank);
- (*newgroup)->set_mapping(actor, j);
+ for (int i = 0; i < newsize; i++) {
+ s4u::Actor* actor = this->actor(to_incl[i]);
+ (*newgroup)->set_mapping(actor, i);
}
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
int Group::range_excl(int n, int ranges[][3], MPI_Group* newgroup) const
{
- std::vector<bool> to_excl(size_, false);
- int newsize = size_;
+ std::vector<bool> to_excl(size(), false);
+ int newsize = size();
for (int i = 0; i < n; i++) {
- for (int j = ranges[i][0]; j >= 0 && j < size_ && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
+ for (int j = ranges[i][0]; j >= 0 && j < size() && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
j += ranges[i][2]) {
to_excl[j] = true;
newsize--;
}
if (newsize == 0) {
*newgroup = MPI_GROUP_EMPTY;
- } else {
- *newgroup = new Group(newsize);
-
- int j = 0;
- for (int rank = 0; rank < size_; rank++) {
- if (not to_excl[rank]) {
- s4u::Actor* actor = this->actor(rank);
- (*newgroup)->set_mapping(actor, j);
- j++;
- }
+ return MPI_SUCCESS;
+ }
+
+ *newgroup = new Group(newsize);
+ int j = 0;
+ for (int i = 0; i < size(); i++) {
+ if (not to_excl[i]) {
+ s4u::Actor* actor = this->actor(i);
+ (*newgroup)->set_mapping(actor, j);
+ j++;
}
}
- if((*newgroup)!=MPI_GROUP_EMPTY)
- (*newgroup)->add_f();
+ (*newgroup)->add_f();
return MPI_SUCCESS;
}
