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
Use std::vector instead of plain arrays in smpi_topo.
[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
04b5179
..
82bfd74
100644
(file)
--- a/
src/smpi/mpi/smpi_topo.cpp
+++ b/
src/smpi/mpi/smpi_topo.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-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. */
@@
-19,35
+19,12
@@
static int getfactors(int num, int *nfators, int **factors);
namespace simgrid{
namespace smpi{
namespace simgrid{
namespace smpi{
-Topo_Graph::~Topo_Graph()
-{
- delete[] index_;
- delete[] edges_;
-}
-
-Topo_Dist_Graph::~Topo_Dist_Graph()
-{
- delete[] in_;
- delete[] in_weights_;
- delete[] out_;
- delete[] out_weights_;
-}
-
/*******************************************************************************
* Cartesian topologies
******************************************************************************/
/*******************************************************************************
* Cartesian topologies
******************************************************************************/
-Topo_Cart::~Topo_Cart()
-{
- delete[] dims_;
- delete[] periodic_;
- delete[] position_;
-}
-Topo_Cart::Topo_Cart(int ndims) : ndims_(ndims)
+Topo_Cart::Topo_Cart(int ndims) : ndims_(ndims)
, dims_(ndims), periodic_(ndims), position_(ndims)
{
{
- dims_ = new int[ndims];
- periodic_ = new int[ndims];
- position_ = new int[ndims];
}
/* reorder is ignored, don't know what would be the consequences of a dumb reordering but neither do I see the point of
}
/* reorder is ignored, don't know what would be the consequences of a dumb reordering but neither do I see the point of
@@
-70,7
+47,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;
@@
-112,8
+89,8
@@
Topo_Cart* Topo_Cart::sub(const int remain_dims[], MPI_Comm *newcomm) {
}
if (newNDims > 0) {
}
if (newNDims > 0) {
- newDims
= xbt_new(int, newNDims)
;
- newPeriodic =
xbt_new(int, newNDims)
;
+ newDims
= new int[newNDims]
;
+ newPeriodic =
new int[newNDims]
;
// that should not segfault
int j = 0;
// that should not segfault
int j = 0;
@@
-125,7
+102,10
@@
Topo_Cart* Topo_Cart::sub(const int remain_dims[], MPI_Comm *newcomm) {
}
}
}
}
}
}
- return new Topo_Cart(getComm(), newNDims, newDims, newPeriodic, 0, newcomm);
+ Topo_Cart* res = new Topo_Cart(getComm(), newNDims, newDims, newPeriodic, 0, newcomm);
+ delete[] newDims;
+ delete[] newPeriodic;
+ return res;
}
int Topo_Cart::coords(int rank, int maxdims, int coords[]) {
}
int Topo_Cart::coords(int rank, int maxdims, int coords[]) {