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
Finally rename smpi::Group::actor_pid() back to actor().
[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
13d0d00
..
797fae4
100644
(file)
--- a/
src/smpi/mpi/smpi_group.cpp
+++ b/
src/smpi/mpi/smpi_group.cpp
@@
-44,7
+44,7
@@
int Group::rank(aid_t pid) const
return res;
}
return res;
}
-aid_t Group::actor
_pid
(int rank) const
+aid_t Group::actor(int rank) const
{
return (0 <= rank && rank < size()) ? rank_to_pid_map_[rank] : -1;
}
{
return (0 <= rank && rank < size()) ? rank_to_pid_map_[rank] : -1;
}
@@
-73,7
+73,7
@@
int Group::compare(const Group* group2) const
result = MPI_UNEQUAL;
} else {
for (int i = 0; i < size(); i++) {
result = MPI_UNEQUAL;
} else {
for (int i = 0; i < size(); i++) {
- int rank = group2->rank(actor
_pid
(i));
+ int rank = group2->rank(actor(i));
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
break;
if (rank == MPI_UNDEFINED) {
result = MPI_UNEQUAL;
break;
@@
-95,7
+95,7
@@
int Group::incl(int n, const int* ranks, MPI_Group* newgroup) const
*newgroup = new Group(n);
for (int i = 0; i < n; i++) {
*newgroup = new Group(n);
for (int i = 0; i < n; i++) {
- aid_t actor = this->actor
_pid
(ranks[i]);
+ aid_t actor = this->actor(ranks[i]);
(*newgroup)->set_mapping(actor, i);
}
(*newgroup)->add_f();
(*newgroup)->set_mapping(actor, i);
}
(*newgroup)->add_f();
@@
-121,7
+121,7
@@
int Group::group_union(const Group* group2, MPI_Group* newgroup) const
{
std::vector<int> ranks2;
for (int i = 0; i < group2->size(); i++) {
{
std::vector<int> ranks2;
for (int i = 0; i < group2->size(); i++) {
- aid_t actor = group2->actor
_pid
(i);
+ aid_t actor = group2->actor(i);
if (rank(actor) == MPI_UNDEFINED)
ranks2.push_back(i);
}
if (rank(actor) == MPI_UNDEFINED)
ranks2.push_back(i);
}
@@
-135,11
+135,11
@@
int Group::group_union(const Group* group2, MPI_Group* newgroup) const
*newgroup = new Group(newsize);
int i;
for (i = 0; i < size(); i++) {
*newgroup = new Group(newsize);
int i;
for (i = 0; i < size(); i++) {
- aid_t actor1 = actor
_pid
(i);
+ aid_t actor1 = actor(i);
(*newgroup)->set_mapping(actor1, i);
}
for (int j : ranks2) {
(*newgroup)->set_mapping(actor1, i);
}
for (int j : ranks2) {
- aid_t actor2 = group2->actor
_pid
(j);
+ aid_t actor2 = group2->actor(j);
(*newgroup)->set_mapping(actor2, i);
i++;
}
(*newgroup)->set_mapping(actor2, i);
i++;
}
@@
-151,7
+151,7
@@
int Group::intersection(const Group* group2, MPI_Group* newgroup) const
{
std::vector<int> ranks2;
for (int i = 0; i < group2->size(); i++) {
{
std::vector<int> ranks2;
for (int i = 0; i < group2->size(); i++) {
- aid_t actor = group2->actor
_pid
(i);
+ aid_t actor = group2->actor(i);
if (rank(actor) != MPI_UNDEFINED)
ranks2.push_back(i);
}
if (rank(actor) != MPI_UNDEFINED)
ranks2.push_back(i);
}
@@
-162,7
+162,7
@@
int Group::difference(const Group* group2, MPI_Group* newgroup) const
{
std::vector<int> ranks;
for (int i = 0; i < size(); i++) {
{
std::vector<int> ranks;
for (int i = 0; i < size(); i++) {
- aid_t actor = this->actor
_pid
(i);
+ aid_t actor = this->actor(i);
if (group2->rank(actor) == MPI_UNDEFINED)
ranks.push_back(i);
}
if (group2->rank(actor) == MPI_UNDEFINED)
ranks.push_back(i);
}