-/* 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 "simgrid/s4u/Actor.hpp"
#include "smpi_group.hpp"
#include "smpi_comm.hpp"
#include <string>
namespace simgrid{
namespace smpi{
+using simgrid::s4u::ActorPtr;
+
Group::Group()
{
size_ = 0; /* size */
refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */
}
-Group::Group(int n) : size_(n), rank_to_index_map_(size_)
+Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr), index_to_rank_map_(size_, MPI_UNDEFINED)
{
refcount_ = 1;
- for (int i = 0; i < size_; i++)
- rank_to_index_map_[i] = MPI_UNDEFINED;
}
-Group::Group(MPI_Group origin)
+Group::Group(Group* origin)
{
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
refcount_ = 1;
- rank_to_index_map_ = origin->rank_to_index_map_;
-
- for (auto const& elm : origin->index_to_rank_map_) {
- index_to_rank_map_.insert({elm.first, elm.second});
- }
+ // 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()
+void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank)
{
- rank_to_index_map_.clear();
-}
+ 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;
+ }
-void Group::set_mapping(int index, int rank)
-{
- if (rank < size_) {
- rank_to_index_map_[rank] = index;
- if (index != MPI_UNDEFINED)
- index_to_rank_map_.insert({index, rank});
+ 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)
-{
- if (this == MPI_GROUP_EMPTY)
- return MPI_UNDEFINED;
- auto rank = index_to_rank_map_.find(index);
- return rank == index_to_rank_map_.end() ? MPI_UNDEFINED : rank->second;
+simgrid::s4u::ActorPtr Group::actor(int rank) {
+ if (0 <= rank && rank < size_)
+ return rank_to_actor_map_[rank];
+ else
+ return nullptr;
+}
+
+int Group::rank(const simgrid::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()
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++) {
+ ActorPtr actor = this->actor(i);
+ int rank = group2->rank(actor);
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
break;
int Group::incl(int n, int* ranks, MPI_Group* newgroup)
{
int i=0;
- int index=0;
if (n == 0) {
*newgroup = MPI_GROUP_EMPTY;
} else if (n == size_) {
} else {
*newgroup = new Group(n);
for (i = 0; i < n; i++) {
- index = this->index(ranks[i]);
- (*newgroup)->set_mapping(index, i);
+ ActorPtr actor = this->actor(ranks[i]); // ranks[] was passed as a param!
+ (*newgroup)->set_mapping(actor, i);
}
}
return MPI_SUCCESS;
int size1 = size_;
int size2 = group2->size();
for (int i = 0; i < size2; i++) {
- int proc2 = group2->index(i);
- int proc1 = this->rank(proc2);
+ ActorPtr actor = group2->actor(i);
+ int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size1++;
}
*newgroup = new Group(size1);
size2 = this->size();
for (int i = 0; i < size2; i++) {
- int proc1 = this->index(i);
- (*newgroup)->set_mapping(proc1, i);
+ 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);
+ ActorPtr actor = group2->actor(i - size2);
+ (*newgroup)->set_mapping(actor, i);
}
}
return MPI_SUCCESS;
{
int size2 = group2->size();
for (int i = 0; i < size2; i++) {
- int proc2 = group2->index(i);
- int proc1 = this->rank(proc2);
+ ActorPtr actor = group2->actor(i);
+ int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size2--;
}
*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);
+ 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++;
}
}
int newsize = size_;
int size2 = size_;
for (int i = 0; i < size2; i++) {
- int proc1 = this->index(i);
- int proc2 = group2->rank(proc1);
+ ActorPtr actor = this->actor(i);
+ int proc2 = group2->rank(actor);
if (proc2 != MPI_UNDEFINED) {
newsize--;
}
} else {
*newgroup = new Group(newsize);
for (int i = 0; i < size2; i++) {
- int proc1 = this->index(i);
- int proc2 = group2->rank(proc1);
+ ActorPtr actor = this->actor(i);
+ int proc2 = group2->rank(actor);
if (proc2 == MPI_UNDEFINED) {
- (*newgroup)->set_mapping(proc1, i);
+ (*newgroup)->set_mapping(actor, i);
}
}
}
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);
+ ActorPtr actor = this->actor(i);
+ (*newgroup)->set_mapping(actor, j);
j++;
}
}
}
+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++) {
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);
for (int rank = ranges[i][0]; /* First */
rank >= 0 && rank < size_; /* Last */
) {
- int index = this->index(rank);
- (*newgroup)->set_mapping(index, j);
+ 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;
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) {
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(add==1){
- int index = this->index(oldrank);
- (*newgroup)->set_mapping(index, newrank);
+ ActorPtr actor = this->actor(oldrank);
+ (*newgroup)->set_mapping(actor, newrank);
newrank++;
}
oldrank++;
