turn unimportant warnings into info in colls and improve messages

[simgrid.git] / src / smpi / colls / allgatherv / allgatherv-ompi-neighborexchange.cpp

diff --git a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
index 74542de..dd8b7f7 100644 (file)
--- a/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-ompi-neighborexchange.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team.
+/* Copyright (c) 2013-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -69,11 +69,11 @@ namespace simgrid{
 namespace smpi{
 
 int
-Coll_allgatherv_ompi_neighborexchange::allgatherv(const void *sbuf, int scount,
-                                                  MPI_Datatype sdtype,
-                                                  void* rbuf, const int *rcounts, const int *rdispls,
-                                                  MPI_Datatype rdtype,
-                                                  MPI_Comm comm)
+allgatherv__ompi_neighborexchange(const void *sbuf, int scount,
+                                  MPI_Datatype sdtype,
+                                  void* rbuf, const int *rcounts, const int *rdispls,
+                                  MPI_Datatype rdtype,
+                                  MPI_Comm comm)
 {
     int line = -1;
     int rank, size;
@@ -82,17 +82,15 @@ Coll_allgatherv_ompi_neighborexchange::allgatherv(const void *sbuf, int scount,
     int i, even_rank;
     int err = 0;
     ptrdiff_t slb, rlb, sext, rext;
-    char *tmpsend = NULL, *tmprecv = NULL;
-
+    char *tmpsend = nullptr, *tmprecv = nullptr;
 
     size = comm->size();
     rank = comm->rank();
 
     if (size % 2) {
-        XBT_DEBUG(
-                     "coll:tuned:allgatherv_ompi_neighborexchange WARNING: odd size %d, switching to ring algorithm",
+        XBT_INFO("allgatherv__ompi_neighborexchange: odd size %d, switching to ring algorithm",
                      size);
-        return Coll_allgatherv_ring::allgatherv(sbuf, scount, sdtype,
+        return allgatherv__ring(sbuf, scount, sdtype,
                                                      rbuf, rcounts,
                                                      rdispls, rdtype,
                                                      comm);
@@ -142,7 +140,7 @@ Coll_allgatherv_ompi_neighborexchange::allgatherv(const void *sbuf, int scount,
        - Rest of the steps:
        update recv_data_from according to offset, and
        exchange two blocks with appropriate neighbor.
-       the send location becomes previous receve location.
+       the send location becomes previous receive location.
        Note, we need to create indexed datatype to send and receive these
        blocks properly.
     */
@@ -215,7 +213,7 @@ Coll_allgatherv_ompi_neighborexchange::allgatherv(const void *sbuf, int scount,
     return MPI_SUCCESS;
 
  err_hndl:
-    XBT_DEBUG(  "%s:%4d\tError occurred %d, rank %2d",
+    XBT_WARN(  "%s:%4d\tError occurred %d, rank %2d",
                  __FILE__, line, err, rank);
     return err;
 }