topo was a bit too eager to return errors.

[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 37c62ef..9b0779b 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_topo.cpp
+++ b/src/smpi/bindings/smpi_pmpi_topo.cpp
@@ -19,7 +19,11 @@ int PMPI_Cart_create(MPI_Comm comm_old, int ndims, const int* dims, const int* p
     return MPI_ERR_COMM;
   } else if (ndims < 0 || (ndims > 0 && (dims == nullptr || periodic == nullptr)) || comm_cart == nullptr) {
     return MPI_ERR_ARG;
-  } else{
+  } else {
+    for (int i = 0; i < ndims; i++)
+      if (dims[i] < 0)
+        return MPI_ERR_ARG;
+
     simgrid::smpi::Topo_Cart* topo = new simgrid::smpi::Topo_Cart(comm_old, ndims, dims, periodic, reorder, comm_cart);
     if (*comm_cart == MPI_COMM_NULL) {
       delete topo;
@@ -35,7 +39,7 @@ int PMPI_Cart_rank(MPI_Comm comm, const int* coords, int* rank) {
     return MPI_ERR_TOPOLOGY;
   }
   if (coords == nullptr) {
-    return MPI_ERR_ARG;
+    return MPI_SUCCESS;
   }
   MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
   if (topo==nullptr) {
@@ -65,11 +69,11 @@ int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) {
   if (rank < 0 || rank >= comm->size()) {
     return MPI_ERR_RANK;
   }
-  if (maxdims <= 0) {
+  if (maxdims < 0) {
     return MPI_ERR_ARG;
   }
-  if(coords == nullptr) {
-    return MPI_ERR_ARG;
+  if(maxdims==0 || coords == nullptr) {
+    return MPI_SUCCESS;
   }
   MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
   if (topo==nullptr) {
@@ -79,10 +83,13 @@ int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) {
 }
 
 int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords) {
+  if(dims == nullptr || periods == nullptr || coords == nullptr){
+    return MPI_SUCCESS;
+  }
   if(comm == nullptr || comm->topo() == nullptr) {
     return MPI_ERR_TOPOLOGY;
   }
-  if(maxdims <= 0 || dims == nullptr || periods == nullptr || coords == nullptr) {
+  if(maxdims <= 0) {
     return MPI_ERR_ARG;
   }
   MPIR_Cart_Topology topo = static_cast<MPIR_Cart_Topology>(comm->topo());
@@ -108,7 +115,7 @@ int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) {
 
 int PMPI_Dims_create(int nnodes, int ndims, int* dims) {
   if(dims == nullptr) {
-    return MPI_ERR_ARG;
+    return MPI_SUCCESS;
   }
   if (ndims < 1 || nnodes < 1) {
     return MPI_ERR_DIMS;