A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have the communicators created together share a unique ID.
[simgrid.git]
/
src
/
smpi
/
mpi
/
smpi_group.cpp
diff --git
a/src/smpi/mpi/smpi_group.cpp
b/src/smpi/mpi/smpi_group.cpp
index
12c412c
..
68d86f8
100644
(file)
--- a/
src/smpi/mpi/smpi_group.cpp
+++ b/
src/smpi/mpi/smpi_group.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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. */
@@
-17,33
+17,26
@@
MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY;
namespace simgrid{
namespace smpi{
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_actor_map_(size_, nullptr)
-{
- refcount_ = 1;
-}
-
Group::Group(Group* origin)
{
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
Group::Group(Group* origin)
{
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
- refcount_ = 1;
+ // 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_actor_map_ = origin->rank_to_actor_map_;
actor_to_rank_map_ = origin->actor_to_rank_map_;
}
}
-void Group::set_mapping(s
imgrid::s
4u::ActorPtr actor, int rank)
+void Group::set_mapping(s4u::ActorPtr actor, int rank)
{
if (0 <= rank && rank < size_) {
int index = actor->get_pid();
{
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;
if (actor != nullptr) {
rank_to_actor_map_[rank] = actor;
if (actor != nullptr) {
@@
-52,14
+45,27
@@
void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank)
}
}
}
}
-simgrid::s4u::ActorPtr Group::actor(int rank) {
+int Group::rank(int index)
+{
+ 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::ActorPtr Group::actor(int rank)
+{
if (0 <= rank && rank < size_)
return rank_to_actor_map_[rank];
else
return nullptr;
}
if (0 <= rank && rank < size_)
return rank_to_actor_map_[rank];
else
return nullptr;
}
-int Group::rank(const simgrid::s4u::ActorPtr actor) {
+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;
}
auto iterator = actor_to_rank_map_.find(actor);
return (iterator == actor_to_rank_map_.end()) ? MPI_UNDEFINED : (*iterator).second;
}
@@
-77,11
+83,6
@@
void Group::unref(Group* group)
}
}
}
}
-int Group::size()
-{
- return size_;
-}
-
int Group::compare(MPI_Group group2)
{
int result;
int Group::compare(MPI_Group group2)
{
int result;
@@
-91,7
+92,7
@@
int Group::compare(MPI_Group group2)
result = MPI_UNEQUAL;
} else {
for (int i = 0; i < size_; i++) {
result = MPI_UNEQUAL;
} else {
for (int i = 0; i < size_; i++) {
- ActorPtr actor = this->actor(i);
+
s4u::
ActorPtr actor = this->actor(i);
int rank = group2->rank(actor);
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
int rank = group2->rank(actor);
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
@@
-105,7
+106,7
@@
int Group::compare(MPI_Group group2)
return result;
}
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;
if (n == 0) {
{
int i=0;
if (n == 0) {
@@
-117,7
+118,7
@@
int Group::incl(int n, int* ranks, MPI_Group* newgroup)
} else {
*newgroup = new Group(n);
for (i = 0; i < n; i++) {
} else {
*newgroup = new Group(n);
for (i = 0; i < n; i++) {
- ActorPtr actor = this->actor(ranks[i]); // ranks[] was passed as a param!
+
s4u::
ActorPtr actor = this->actor(ranks[i]); // ranks[] was passed as a param!
(*newgroup)->set_mapping(actor, i);
}
}
(*newgroup)->set_mapping(actor, i);
}
}
@@
-129,7
+130,7
@@
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 size1 = size_;
int size2 = group2->size();
for (int i = 0; i < size2; i++) {
- ActorPtr actor = group2->actor(i);
+
s4u::
ActorPtr actor = group2->actor(i);
int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size1++;
int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size1++;
@@
-141,11
+142,11
@@
int Group::group_union(MPI_Group group2, MPI_Group* newgroup)
*newgroup = new Group(size1);
size2 = this->size();
for (int i = 0; i < size2; i++) {
*newgroup = new Group(size1);
size2 = this->size();
for (int i = 0; i < size2; i++) {
- ActorPtr actor1 = this->actor(i);
+
s4u::
ActorPtr actor1 = this->actor(i);
(*newgroup)->set_mapping(actor1, i);
}
for (int i = size2; i < size1; i++) {
(*newgroup)->set_mapping(actor1, i);
}
for (int i = size2; i < size1; i++) {
- ActorPtr actor = group2->actor(i - size2);
+
s4u::
ActorPtr actor = group2->actor(i - size2);
(*newgroup)->set_mapping(actor, i);
}
}
(*newgroup)->set_mapping(actor, i);
}
}
@@
-156,7
+157,7
@@
int Group::intersection(MPI_Group group2, MPI_Group* newgroup)
{
int size2 = group2->size();
for (int i = 0; i < size2; i++) {
{
int size2 = group2->size();
for (int i = 0; i < size2; i++) {
- ActorPtr actor = group2->actor(i);
+
s4u::
ActorPtr actor = group2->actor(i);
int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size2--;
int proc1 = this->rank(actor);
if (proc1 == MPI_UNDEFINED) {
size2--;
@@
-168,7
+169,7
@@
int Group::intersection(MPI_Group group2, MPI_Group* newgroup)
*newgroup = new Group(size2);
int j=0;
for (int i = 0; i < group2->size(); i++) {
*newgroup = new Group(size2);
int j=0;
for (int i = 0; i < group2->size(); i++) {
- ActorPtr actor = group2->actor(i);
+
s4u::
ActorPtr actor = group2->actor(i);
int proc1 = this->rank(actor);
if (proc1 != MPI_UNDEFINED) {
(*newgroup)->set_mapping(actor, j);
int proc1 = this->rank(actor);
if (proc1 != MPI_UNDEFINED) {
(*newgroup)->set_mapping(actor, j);
@@
-184,7
+185,7
@@
int Group::difference(MPI_Group group2, MPI_Group* newgroup)
int newsize = size_;
int size2 = size_;
for (int i = 0; i < size2; i++) {
int newsize = size_;
int size2 = size_;
for (int i = 0; i < size2; i++) {
- ActorPtr actor = this->actor(i);
+
s4u::
ActorPtr actor = this->actor(i);
int proc2 = group2->rank(actor);
if (proc2 != MPI_UNDEFINED) {
newsize--;
int proc2 = group2->rank(actor);
if (proc2 != MPI_UNDEFINED) {
newsize--;
@@
-195,7
+196,7
@@
int Group::difference(MPI_Group group2, MPI_Group* newgroup)
} else {
*newgroup = new Group(newsize);
for (int i = 0; i < size2; i++) {
} else {
*newgroup = new Group(newsize);
for (int i = 0; i < size2; i++) {
- ActorPtr actor = this->actor(i);
+
s4u::
ActorPtr actor = this->actor(i);
int proc2 = group2->rank(actor);
if (proc2 == MPI_UNDEFINED) {
(*newgroup)->set_mapping(actor, i);
int proc2 = group2->rank(actor);
if (proc2 == MPI_UNDEFINED) {
(*newgroup)->set_mapping(actor, i);
@@
-205,7
+206,7
@@
int Group::difference(MPI_Group group2, MPI_Group* newgroup)
return MPI_SUCCESS;
}
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 oldsize = size_;
int newsize = oldsize - n;
*newgroup = new Group(newsize);
@@
-217,7
+218,7
@@
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 j = 0;
for (int i = 0; i < oldsize; i++) {
if(to_exclude[i]==0){
- ActorPtr actor = this->actor(i);
+
s4u::
ActorPtr actor = this->actor(i);
(*newgroup)->set_mapping(actor, j);
j++;
}
(*newgroup)->set_mapping(actor, j);
j++;
}
@@
-256,7
+257,7
@@
int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){
for (int rank = ranges[i][0]; /* First */
rank >= 0 && rank < size_; /* Last */
) {
for (int rank = ranges[i][0]; /* First */
rank >= 0 && rank < size_; /* Last */
) {
- ActorPtr actor = this->actor(rank);
+
s4u::
ActorPtr actor = this->actor(rank);
(*newgroup)->set_mapping(actor, j);
j++;
if(rank == ranges[i][1]){/*already last ?*/
(*newgroup)->set_mapping(actor, j);
j++;
if(rank == ranges[i][1]){/*already last ?*/
@@
-308,7
+309,7
@@
int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){
}
}
if(add==1){
}
}
if(add==1){
- ActorPtr actor = this->actor(oldrank);
+
s4u::
ActorPtr actor = this->actor(oldrank);
(*newgroup)->set_mapping(actor, newrank);
newrank++;
}
(*newgroup)->set_mapping(actor, newrank);
newrank++;
}