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
Add new entry in Release_Notes.
[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 7e774e6f9fb68487fc8023e059c36cdf00bfae51..0bbda74969d77c77370a6c870c684a28909d8ded 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-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
@@
-14,8
+14,8
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
* check if the topology is nullptr, but we should check if it is the good topology type (so we have to add a
* MPIR_Topo_Type field, and replace the MPI_Topology field by an union)*/
* check if the topology is nullptr, but we should check if it is the good topology type (so we have to add a
* MPIR_Topo_Type field, and replace the MPI_Topology field by an union)*/
-int PMPI_Cart_create(MPI_Comm comm
_old
, int ndims, const int* dims, const int* periodic, int reorder, MPI_Comm* comm_cart) {
- CHECK_COMM
2(1, comm_old
)
+int PMPI_Cart_create(MPI_Comm comm, int ndims, const int* dims, const int* periodic, int reorder, MPI_Comm* comm_cart) {
+ CHECK_COMM
(1
)
if (ndims > 0){
CHECK_NULL(3, MPI_ERR_ARG, dims)
CHECK_NULL(4, MPI_ERR_ARG, periodic)
if (ndims > 0){
CHECK_NULL(3, MPI_ERR_ARG, dims)
CHECK_NULL(4, MPI_ERR_ARG, periodic)
@@
-24,8
+24,8
@@
int PMPI_Cart_create(MPI_Comm comm_old, int ndims, const int* dims, const int* p
CHECK_NEGATIVE(2, MPI_ERR_ARG, ndims)
for (int i = 0; i < ndims; i++)
CHECK_NEGATIVE(2, MPI_ERR_ARG, dims[i])
CHECK_NEGATIVE(2, MPI_ERR_ARG, ndims)
for (int i = 0; i < ndims; i++)
CHECK_NEGATIVE(2, MPI_ERR_ARG, dims[i])
- const simgrid::smpi::Topo_Cart* topo =
-
new simgrid::smpi::Topo_Cart(comm_old
, ndims, dims, periodic, reorder, comm_cart);
+ CHECK_COLLECTIVE(comm, __func__)
+
const auto* topo = new simgrid::smpi::Topo_Cart(comm
, ndims, dims, periodic, reorder, comm_cart);
if (*comm_cart == MPI_COMM_NULL) {
delete topo;
} else {
if (*comm_cart == MPI_COMM_NULL) {
delete topo;
} else {
@@
-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().get());
+
auto*
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().get());
+
auto*
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().get());
+
auto*
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().get());
+
auto*
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)
- const
simgrid::smpi::Topo_Cart
* topo = static_cast<MPIR_Cart_Topology>(comm->topo().get());
+ const
auto
* topo = static_cast<MPIR_Cart_Topology>(comm->topo().get());
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
@@
-110,11
+110,12
@@
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().get());
+ CHECK_COLLECTIVE(comm, __func__)
+ auto* topo = static_cast<MPIR_Cart_Topology>(comm->topo().get());
if (topo==nullptr) {
return MPI_ERR_ARG;
}
if (topo==nullptr) {
return MPI_ERR_ARG;
}
- const
simgrid::smpi::Topo_Cart
* cart = topo->sub(remain_dims, comm_new);
+ const
auto
* cart = topo->sub(remain_dims, comm_new);
if(*comm_new==MPI_COMM_NULL)
delete cart;
if(cart==nullptr)
if(*comm_new==MPI_COMM_NULL)
delete cart;
if(cart==nullptr)