Merge pull request #9653 from awlauria/v5.0.x_scatter_v

v5.0.x: coll/basic: Correctly handle zero size datatypes in scatterv/gatherv

Author: awlauria

ompi/mca/coll/basic/coll_basic_gatherv.c

@@ -9,8 +9,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2021 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
@@ -47,6 +47,7 @@ mca_coll_basic_gatherv_intra(const void *sbuf, int scount,
     int i, rank, size, err;
     char *ptmp;
     ptrdiff_t lb, extent;
+    size_t rdsize;
 
     size = ompi_comm_size(comm);
     rank = ompi_comm_rank(comm);
@@ -58,7 +59,9 @@ mca_coll_basic_gatherv_intra(const void *sbuf, int scount,
        0) */
 
     if (rank != root) {
-        if (scount > 0) {
+        size_t sdsize;
+        ompi_datatype_type_size(sdtype, &sdsize);
+        if (scount > 0 && sdsize > 0) {
             return MCA_PML_CALL(send(sbuf, scount, sdtype, root,
                                      MCA_COLL_BASE_TAG_GATHERV,
                                      MCA_PML_BASE_SEND_STANDARD, comm));
@@ -68,6 +71,12 @@ mca_coll_basic_gatherv_intra(const void *sbuf, int scount,
 
     /* I am the root, loop receiving data. */
 
+    ompi_datatype_type_size(rdtype, &rdsize);
+    if (OPAL_UNLIKELY(0 == rdsize)) {
+        /* bozzo case */
+        return MPI_SUCCESS;
+    }
+
     err = ompi_datatype_get_extent(rdtype, &lb, &extent);
     if (OMPI_SUCCESS != err) {
         return OMPI_ERROR;

ompi/mca/coll/basic/coll_basic_scatterv.c

@@ -9,8 +9,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015-2021 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
@@ -49,6 +49,7 @@ mca_coll_basic_scatterv_intra(const void *sbuf, const int *scounts,
     int i, rank, size, err;
     char *ptmp;
     ptrdiff_t lb, extent;
+    size_t sdsize;
 
     /* Initialize */
 
@@ -58,15 +59,23 @@ mca_coll_basic_scatterv_intra(const void *sbuf, const int *scounts,
     /* If not root, receive data. */
 
     if (rank != root) {
+        size_t rdsize;
+        ompi_datatype_type_size(rdtype, &rdsize);
         /* Only receive if there is something to receive */
-        if (rcount > 0) {
+        if (rcount > 0 && rdsize > 0) {
             return MCA_PML_CALL(recv(rbuf, rcount, rdtype,
                                      root, MCA_COLL_BASE_TAG_SCATTERV,
                                      comm, MPI_STATUS_IGNORE));
         }
         return MPI_SUCCESS;
     }
 
+    ompi_datatype_type_size(sdtype, &sdsize);
+    if (OPAL_UNLIKELY(0 == sdsize)) {
+        /* bozzo case */
+        return MPI_SUCCESS;
+    }
+
     /* I am the root, loop sending data. */
 
     err = ompi_datatype_get_extent(sdtype, &lb, &extent);