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
[SIMIX] Remove SMPI-specific segment_index notion from the Actor class
[simgrid.git]
/
src
/
smpi
/
mpi
/
smpi_topo.cpp
diff --git
a/src/smpi/mpi/smpi_topo.cpp
b/src/smpi/mpi/smpi_topo.cpp
index b55b0e313fc41dfad028ea45ea753f4671417adf..be218ba10f4ab685d8e414712c77ef3b9d04c54e 100644
(file)
--- a/
src/smpi/mpi/smpi_topo.cpp
+++ b/
src/smpi/mpi/smpi_topo.cpp
@@
-4,7
+4,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smpi/smpi.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smpi/smpi.h"
-#include "private.h"
+#include "private.h
pp
"
#include "smpi_comm.hpp"
#include "smpi_topo.hpp"
#include "xbt/sysdep.h"
#include "smpi_comm.hpp"
#include "smpi_topo.hpp"
#include "xbt/sysdep.h"
@@
-70,7
+70,7
@@
Topo_Cart::Topo_Cart(MPI_Comm comm_old, int ndims, int dims[], int periods[], in
oldGroup = comm_old->group();
newGroup = new Group(newSize);
for (int i = 0 ; i < newSize ; i++) {
oldGroup = comm_old->group();
newGroup = new Group(newSize);
for (int i = 0 ; i < newSize ; i++) {
- newGroup->set_mapping(oldGroup->
index
(i), i);
+ newGroup->set_mapping(oldGroup->
actor
(i), i);
}
nnodes_ = newSize;
}
nnodes_ = newSize;
@@
-94,7
+94,7
@@
Topo_Cart::Topo_Cart(MPI_Comm comm_old, int ndims, int dims[], int periods[], in
*comm_cart = MPI_COMM_NULL;
}
}
*comm_cart = MPI_COMM_NULL;
}
}
-
comm_=*comm_cart
;
+
setComm(*comm_cart)
;
}
Topo_Cart* Topo_Cart::sub(const int remain_dims[], MPI_Comm *newcomm) {
}
Topo_Cart* Topo_Cart::sub(const int remain_dims[], MPI_Comm *newcomm) {
@@
-125,7
+125,7
@@
Topo_Cart* Topo_Cart::sub(const int remain_dims[], MPI_Comm *newcomm) {
}
}
}
}
}
}
- return new Topo_Cart(
comm_
, newNDims, newDims, newPeriodic, 0, newcomm);
+ return new Topo_Cart(
getComm()
, newNDims, newDims, newPeriodic, 0, newcomm);
}
int Topo_Cart::coords(int rank, int maxdims, int coords[]) {
}
int Topo_Cart::coords(int rank, int maxdims, int coords[]) {
@@
-195,7
+195,7
@@
int Topo_Cart::shift(int direction, int disp, int *rank_source, int *rank_dest)
return MPI_ERR_DIMS;
}
return MPI_ERR_DIMS;
}
- this->coords(
comm_->rank(),
ndims_, position);
+ this->coords(
getComm()->rank(),
ndims_, position);
position[direction] += disp;
if(position[direction] < 0 ||
position[direction] += disp;
if(position[direction] < 0 ||