X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/534039d7635bc420c005444981b32e4bcd42ed77..d2958d5c9a0fdca7d0fa344382c13cbcfc581597:/src/smpi/mpi/smpi_group.cpp

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index 8d2d65319a..797fae4556 100644
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. 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. */
@@ -8,8 +8,7 @@
 #include "smpi_comm.hpp"
 #include <string>
 
-simgrid::smpi::Group mpi_MPI_GROUP_EMPTY;
-MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY;
+simgrid::smpi::Group smpi_MPI_GROUP_EMPTY;
 
 namespace simgrid{
 namespace smpi{
@@ -17,55 +16,37 @@ namespace smpi{
 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_;
-    actor_to_rank_map_ = origin->actor_to_rank_map_;
+    rank_to_pid_map_ = origin->rank_to_pid_map_;
+    pid_to_rank_map_ = origin->pid_to_rank_map_;
   }
 }
 
-void Group::set_mapping(s4u::Actor* actor, int rank)
+void Group::set_mapping(aid_t pid, int rank)
 {
-  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;
-    }
-
-    rank_to_actor_map_[rank] = actor;
-    actor_to_rank_map_.insert({actor, rank});
+  if (0 <= rank && rank < size()) {
+    if (static_cast<size_t>(pid) >= pid_to_rank_map_.size())
+      pid_to_rank_map_.resize(pid + 1, MPI_UNDEFINED);
+    rank_to_pid_map_[rank] = pid;
+    pid_to_rank_map_[pid]  = rank;
   }
 }
 
-int Group::rank(int index)
+int Group::rank(aid_t pid) const
 {
-  int rank;
-  if (0 <= index && (unsigned)index < index_to_rank_map_.size())
-    rank = index_to_rank_map_[index];
-  else
-    rank = MPI_UNDEFINED;
-
-  return rank;
-}
-
-s4u::Actor* Group::actor(int rank)
-{
-  if (0 <= rank && rank < size_)
-    return rank_to_actor_map_[rank];
-  else
-    return nullptr;
+  int res = static_cast<size_t>(pid) < pid_to_rank_map_.size() ? pid_to_rank_map_[pid] : MPI_UNDEFINED;
+  if (res == MPI_UNDEFINED) {
+    // I'm not in the communicator ... but maybe my parent is?
+    if (auto parent = s4u::Actor::by_pid(pid)) {
+      aid_t ppid = parent->get_ppid();
+      res        = static_cast<size_t>(ppid) < pid_to_rank_map_.size() ? pid_to_rank_map_[ppid] : MPI_UNDEFINED;
+    }
+  }
+  return res;
 }
 
-int Group::rank(s4u::Actor* actor)
+aid_t Group::actor(int rank) const
 {
-  auto iterator = actor_to_rank_map_.find(actor);
-  //I'm not in the communicator ... but maybe my parent is ?
-  if (iterator == actor_to_rank_map_.end())
-    iterator = actor_to_rank_map_.find(s4u::Actor::by_pid(actor->get_ppid()).get());
-  return (iterator == actor_to_rank_map_.end()) ? MPI_UNDEFINED : (*iterator).second;
+  return (0 <= rank && rank < size()) ? rank_to_pid_map_[rank] : -1;
 }
 
 void Group::ref()
@@ -77,21 +58,22 @@ void Group::unref(Group* group)
 {
   group->refcount_--;
   if (group->refcount_ <= 0) {
+    if (simgrid::smpi::F2C::lookup() != nullptr)
+      F2C::free_f(group->f2c_id());
     delete group;
   }
 }
 
-int Group::compare(MPI_Group group2)
+int Group::compare(const Group* group2) const
 {
   int result;
 
   result = MPI_IDENT;
-  if (size_ != group2->size()) {
+  if (size() != group2->size()) {
     result = MPI_UNEQUAL;
   } else {
-    for (int i = 0; i < size_; i++) {
-      s4u::Actor* actor = this->actor(i);
-      int rank = group2->rank(actor);
+    for (int i = 0; i < size(); i++) {
+      int rank = group2->rank(actor(i));
       if (rank == MPI_UNDEFINED) {
         result = MPI_UNEQUAL;
         break;
@@ -104,215 +86,122 @@ int Group::compare(MPI_Group group2)
   return result;
 }
 
-int Group::incl(int n, const int* ranks, MPI_Group* newgroup)
+int Group::incl(int n, const int* ranks, MPI_Group* newgroup) const
 {
   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();
-  } 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);
-    }
+    return MPI_SUCCESS;
   }
+
+  *newgroup = new Group(n);
+  for (int i = 0; i < n; i++) {
+    aid_t 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)
+int Group::incl(const std::vector<int>& ranks, MPI_Group* newgroup) const
 {
-  int size1 = size_;
-  int size2 = group2->size();
-  for (int i = 0; i < size2; i++) {
-    s4u::Actor* actor = group2->actor(i);
-    int proc1 = this->rank(actor);
-    if (proc1 == MPI_UNDEFINED) {
-      size1++;
-    }
-  }
-  if (size1 == 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);
-    }
-  }
-  return MPI_SUCCESS;
+  return incl(static_cast<int>(ranks.size()), ranks.data(), newgroup);
 }
 
-int Group::intersection(MPI_Group group2, MPI_Group* newgroup)
+int Group::excl(const std::vector<bool>& excl_map, MPI_Group* newgroup) const
 {
-  int size2 = group2->size();
-  for (int i = 0; i < size2; i++) {
-    s4u::Actor* actor = group2->actor(i);
-    int proc1 = this->rank(actor);
-    if (proc1 == MPI_UNDEFINED) {
-      size2--;
-    }
-  }
-  if (size2 == 0) {
-    *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++;
-      }
-    }
-  }
-  return MPI_SUCCESS;
+  xbt_assert(static_cast<int>(excl_map.size()) == size());
+  std::vector<int> ranks;
+  for (int i = 0; i < static_cast<int>(excl_map.size()); i++)
+    if (not excl_map[i])
+      ranks.push_back(i);
+  return incl(static_cast<int>(ranks.size()), ranks.data(), newgroup);
 }
 
-int Group::difference(MPI_Group group2, MPI_Group* newgroup)
+int Group::group_union(const Group* group2, MPI_Group* newgroup) const
 {
-  int newsize = size_;
-  int size2 = size_;
-  for (int i = 0; i < size2; i++) {
-    s4u::Actor* actor = this->actor(i);
-    int proc2 = group2->rank(actor);
-    if (proc2 != MPI_UNDEFINED) {
-      newsize--;
-    }
+  std::vector<int> ranks2;
+  for (int i = 0; i < group2->size(); i++) {
+    aid_t actor = group2->actor(i);
+    if (rank(actor) == MPI_UNDEFINED)
+      ranks2.push_back(i);
   }
+
+  int newsize = size() + static_cast<int>(ranks2.size());
   if (newsize == 0) {
     *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);
-      }
-    }
+    return MPI_SUCCESS;
+  }
+
+  *newgroup = new Group(newsize);
+  int i;
+  for (i = 0; i < size(); i++) {
+    aid_t actor1 = actor(i);
+    (*newgroup)->set_mapping(actor1, i);
   }
+  for (int j : ranks2) {
+    aid_t actor2 = group2->actor(j);
+    (*newgroup)->set_mapping(actor2, i);
+    i++;
+  }
+  (*newgroup)->add_f();
   return MPI_SUCCESS;
 }
 
-int Group::excl(int n, const int *ranks, MPI_Group * newgroup){
-  int oldsize = size_;
-  int newsize = oldsize - n;
-  *newgroup = new  Group(newsize);
-  auto* to_exclude = new int[size_];
-  for (int i     = 0; i < oldsize; i++)
-    to_exclude[i]=0;
-  for (int i            = 0; i < n; i++)
-    to_exclude[ranks[i]]=1;
-  int j = 0;
-  for (int i = 0; i < oldsize; i++) {
-    if(to_exclude[i]==0){
-      s4u::Actor* actor = this->actor(i);
-      (*newgroup)->set_mapping(actor, j);
-      j++;
-    }
+int Group::intersection(const Group* group2, MPI_Group* newgroup) const
+{
+  std::vector<int> ranks2;
+  for (int i = 0; i < group2->size(); i++) {
+    aid_t actor = group2->actor(i);
+    if (rank(actor) != MPI_UNDEFINED)
+      ranks2.push_back(i);
   }
-  delete[] to_exclude;
-  return MPI_SUCCESS;
+  return group2->incl(ranks2, newgroup);
+}
+
+int Group::difference(const Group* group2, MPI_Group* newgroup) const
+{
+  std::vector<int> ranks;
+  for (int i = 0; i < size(); i++) {
+    aid_t actor = this->actor(i);
+    if (group2->rank(actor) == MPI_UNDEFINED)
+      ranks.push_back(i);
+  }
+  return this->incl(ranks, newgroup);
+}
+
+int Group::excl(int n, const int* ranks, MPI_Group* newgroup) const
+{
+  std::vector<bool> to_excl(size(), false);
+  for (int i = 0; i < n; i++)
+    to_excl[ranks[i]] = true;
+  return this->excl(to_excl, newgroup);
 }
 
 static bool is_rank_in_range(int rank, int first, int last)
 {
-  if (first < last)
-    return rank <= last;
-  else
-    return rank >= last;
+  return (first <= rank && rank <= last) || (first >= rank && rank >= last);
 }
 
-int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){
-  int newsize = 0;
-  for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
-      newsize++;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
-    }
-  }
-  *newgroup = new  Group(newsize);
-  int j     = 0;
+int Group::range_incl(int n, const int ranges[][3], MPI_Group* newgroup) const
+{
+  std::vector<int> ranks;
   for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
-      s4u::Actor* actor = this->actor(rank);
-      (*newgroup)->set_mapping(actor, j);
-      j++;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
-    }
+    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])
+      ranks.push_back(j);
   }
-  return MPI_SUCCESS;
+  return this->incl(ranks, newgroup);
 }
 
-int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){
-  int newsize = size_;
+int Group::range_excl(int n, const int ranges[][3], MPI_Group* newgroup) const
+{
+  std::vector<bool> to_excl(size(), false);
   for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
-      newsize--;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
-    }
+    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;
   }
-  if (newsize == 0) {
-    *newgroup = MPI_GROUP_EMPTY;
-  } else {
-    *newgroup = new  Group(newsize);
-    int newrank = 0;
-    int oldrank = 0;
-    while (newrank < newsize) {
-      int add = 1;
-      for (int i = 0; i < n; i++) {
-        for (int rank = ranges[i][0]; rank >= 0 && rank < size_;) {
-          if(rank==oldrank){
-            add = 0;
-            break;
-          }
-          if(rank == ranges[i][1]){/*already last ?*/
-            break;
-          }
-          rank += ranges[i][2]; /* Stride */
-          if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-            break;
-        }
-      }
-      if(add==1){
-        s4u::Actor* actor = this->actor(oldrank);
-        (*newgroup)->set_mapping(actor, newrank);
-        newrank++;
-      }
-      oldrank++;
-    }
-  }
-  return MPI_SUCCESS;
+  return this->excl(to_excl, newgroup);
 }
 
 MPI_Group Group::f2c(int id) {