From aa27ce51d3f19f44fd9304a09743b7e579fc769f Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Mon, 4 Jun 2018 11:12:43 +0200 Subject: [PATCH] [SMPI] Groups: Remove old rank2index map This was not used anymore, but the index_to_rank map still needs to be removed; it is still in use and may need a bit more effort. --- src/smpi/include/smpi_group.hpp | 1 - src/smpi/mpi/smpi_group.cpp | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/smpi/include/smpi_group.hpp b/src/smpi/include/smpi_group.hpp index 3c55ae4d23..eb56ba4e4c 100644 --- a/src/smpi/include/smpi_group.hpp +++ b/src/smpi/include/smpi_group.hpp @@ -24,7 +24,6 @@ class Group : public F2C{ */ std::vector rank_to_actor_map_; std::map actor_to_rank_map_; - std::vector rank_to_index_map_; std::vector index_to_rank_map_; int refcount_; diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp index ff759eb6b6..e3eed4d76e 100644 --- a/src/smpi/mpi/smpi_group.cpp +++ b/src/smpi/mpi/smpi_group.cpp @@ -25,7 +25,7 @@ Group::Group() refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */ } -Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr), rank_to_index_map_(size_, MPI_UNDEFINED), index_to_rank_map_(size_, MPI_UNDEFINED) +Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr), index_to_rank_map_(size_, MPI_UNDEFINED) { refcount_ = 1; } @@ -35,7 +35,7 @@ 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_; + // 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_; @@ -46,7 +46,6 @@ void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank) { if (0 <= rank && rank < size_) { int index = actor->get_pid(); - rank_to_index_map_[rank] = index; if (index != MPI_UNDEFINED) { if ((unsigned)index >= index_to_rank_map_.size()) index_to_rank_map_.resize(index + 1, MPI_UNDEFINED); -- 2.20.1