Merge pull request #3486 from ggouaillardet/topic/v2.0.x/a2aw_zeros

v2.0.x: fix MPI_Alltoallw() with zero size messages
open-mpi · May 23, 2017 · 6e83be8 · 6e83be8
2 parents 2658be9 + 5c74e72
commit 6e83be8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/ompi/mca/coll/libnbc/nbc_ialltoallv.c b/ompi/mca/coll/libnbc/nbc_ialltoallv.c
@@ -5,7 +5,7 @@
  *                         Corporation.  All rights reserved.
  * Copyright (c) 2006      The Technical University of Chemnitz. All
  *                         rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
@@ -74,6 +74,11 @@ int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, cons
       }
     }
     span = opal_datatype_span(&recvtype->super, count, &gap);
+    if (OPAL_UNLIKELY(0 == span)) {
+      *request = &ompi_request_empty;
+      NBC_Return_handle (handle);
+      return MPI_SUCCESS;
+    }
     handle->tmpbuf = malloc(span);
     if (OPAL_UNLIKELY(NULL == handle->tmpbuf)) {
       NBC_Return_handle (handle);
@@ -85,6 +90,7 @@ int ompi_coll_libnbc_ialltoallv(const void* sendbuf, const int *sendcounts, cons
     res = ompi_datatype_type_extent (sendtype, &sndext);
     if (MPI_SUCCESS != res) {
       NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res);
+      NBC_Return_handle (handle);
       return res;
     }
     if (sendcounts[rank] != 0) {
@@ -336,13 +342,15 @@ static inline int a2av_sched_inplace(int rank, int p, NBC_Schedule *schedule,
     if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
       return res;
     }
-    res = NBC_Sched_send ((void *)(-gap), true , counts[peer], type, peer, schedule, false);
-    if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
-      return res;
-    }
-    res = NBC_Sched_recv (tbuf, false , counts[peer], type, peer, schedule, true);
-    if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
-      return res;
+    if (0 != counts[peer]) {
+      res = NBC_Sched_send ((void *)(-gap), true , counts[peer], type, peer, schedule, false);
+      if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
+        return res;
+      }
+      res = NBC_Sched_recv (tbuf, false , counts[peer], type, peer, schedule, true);
+      if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
+        return res;
+      }
     }
   }
 

diff --git a/ompi/mca/coll/libnbc/nbc_ialltoallw.c b/ompi/mca/coll/libnbc/nbc_ialltoallw.c
@@ -5,7 +5,7 @@
  *                         Corporation.  All rights reserved.
  * Copyright (c) 2006      The Technical University of Chemnitz. All
  *                         rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
@@ -67,6 +67,11 @@ int ompi_coll_libnbc_ialltoallw(const void* sendbuf, const int *sendcounts, cons
         span = lspan;
       }
     }
+    if (OPAL_UNLIKELY(0 == span)) {
+      *request = &ompi_request_empty;
+      NBC_Return_handle (handle);
+      return OMPI_SUCCESS;
+    }
     handle->tmpbuf = malloc(span);
     if (OPAL_UNLIKELY(NULL == handle->tmpbuf)) {
       NBC_Return_handle (handle);
@@ -80,6 +85,7 @@ int ompi_coll_libnbc_ialltoallw(const void* sendbuf, const int *sendcounts, cons
     sbuf = (char *) sendbuf + sdispls[rank];
     res = NBC_Copy(sbuf, sendcounts[rank], sendtypes[rank], rbuf, recvcounts[rank], recvtypes[rank], comm);
     if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
+      NBC_Return_handle (handle);
       return res;
     }
   }
@@ -193,20 +199,23 @@ static inline int a2aw_sched_linear(int rank, int p, NBC_Schedule *schedule,
   int res;
 
   for (int i = 0; i < p; i++) {
+    ptrdiff_t gap, span;
     if (i == rank) {
       continue;
     }
 
     /* post send */
-    if (sendcounts[i] != 0) {
+    span = opal_datatype_span(&sendtypes[i]->super, sendcounts[i], &gap);
+    if (OPAL_LIKELY(0 < span)) {
       char *sbuf = (char *) sendbuf + sdispls[i];
       res = NBC_Sched_send (sbuf, false, sendcounts[i], sendtypes[i], i, schedule, false);
       if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {
         return res;
       }
     }
     /* post receive */
-    if (recvcounts[i] != 0) {
+    span = opal_datatype_span(&recvtypes[i]->super, recvcounts[i], &gap);
+    if (OPAL_LIKELY(0 < span)) {
       char *rbuf = (char *) recvbuf + rdispls[i];
       res = NBC_Sched_recv (rbuf, false, recvcounts[i], recvtypes[i], i, schedule, false);
       if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) {

diff --git a/opal/datatype/opal_datatype.h b/opal/datatype/opal_datatype.h
@@ -14,6 +14,8 @@
  *                         reserved.
  * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+ * Copyright (c) 2017      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -344,6 +346,9 @@ opal_datatype_span( const opal_datatype_t* pData, int64_t count,
 {
     OPAL_PTRDIFF_TYPE extent = (pData->ub - pData->lb);
     OPAL_PTRDIFF_TYPE true_extent = (pData->true_ub - pData->true_lb);
+    if (OPAL_UNLIKELY(0 == pData->size) || (0 == count)) {
+        return 0;
+    }
     *gap = pData->true_lb;
     return true_extent + (count - 1) * extent;
 }