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
Update copyright lines.
[simgrid.git]
/
src
/
smpi
/
bindings
/
smpi_pmpi_topo.cpp
diff --git
a/src/smpi/bindings/smpi_pmpi_topo.cpp
b/src/smpi/bindings/smpi_pmpi_topo.cpp
index
1f38d48
..
f543fe4
100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi_topo.cpp
+++ b/
src/smpi/bindings/smpi_pmpi_topo.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
21
. 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. */
@@
-29,7
+29,7
@@
int PMPI_Cart_create(MPI_Comm comm_old, int ndims, const int* dims, const int* p
if (*comm_cart == MPI_COMM_NULL) {
delete topo;
} else {
if (*comm_cart == MPI_COMM_NULL) {
delete topo;
} else {
- xbt_assert((*comm_cart)->topo() == topo);
+ xbt_assert((*comm_cart)->topo()
.get()
== topo);
}
return MPI_SUCCESS;
}
}
return MPI_SUCCESS;
}
@@
-38,7
+38,7
@@
int PMPI_Cart_rank(MPI_Comm comm, const int* coords, int* rank) {
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(2, MPI_SUCCESS, coords)
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(2, MPI_SUCCESS, coords)
- MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
+ MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo()
.get()
);
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-51,7
+51,7
@@
int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* d
CHECK_NEGATIVE(3, MPI_ERR_ARG, direction)
CHECK_NULL(4, MPI_ERR_ARG, source)
CHECK_NULL(5, MPI_ERR_ARG, dest)
CHECK_NEGATIVE(3, MPI_ERR_ARG, direction)
CHECK_NULL(4, MPI_ERR_ARG, source)
CHECK_NULL(5, MPI_ERR_ARG, dest)
- MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
+ MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo()
.get()
);
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-66,7
+66,7
@@
int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) {
if(maxdims==0 || coords == nullptr) {
return MPI_SUCCESS;
}
if(maxdims==0 || coords == nullptr) {
return MPI_SUCCESS;
}
- MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
+ MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo()
.get()
);
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-80,7
+80,7
@@
int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coor
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NEGATIVE(3, MPI_ERR_ARG, maxdims)
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NEGATIVE(3, MPI_ERR_ARG, maxdims)
- MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
+ MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo()
.get()
);
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-91,7
+91,7
@@
int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) {
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(2, MPI_ERR_ARG, ndims)
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(2, MPI_ERR_ARG, ndims)
-
MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo
());
+
const simgrid::smpi::Topo_Cart* topo = static_cast<MPIR_Cart_Topology>(comm->topo().get
());
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-110,7
+110,7
@@
int PMPI_Cart_sub(MPI_Comm comm, const int* remain_dims, MPI_Comm* comm_new) {
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(3, MPI_ERR_ARG, comm_new)
CHECK_COMM(1)
CHECK_NULL(1, MPI_ERR_TOPOLOGY, comm->topo())
CHECK_NULL(3, MPI_ERR_ARG, comm_new)
- MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
+ MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo()
.get()
);
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}