Start with an MPI_REQUEST_NULL request.

If the request is not NULL and the first rcounts is 0, the ompi_request_wait will segfault. Also fix the communication tag for the base alltoall. Signed-off-by: George Bosilca <[email protected]>
open-mpi · Nov 16, 2021 · 8c1691b · 8c1691b
1 parent 7786c13
commit 8c1691b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ompi/mca/coll/base/coll_base_alltoall.c b/ompi/mca/coll/base/coll_base_alltoall.c
@@ -108,13 +108,13 @@ mca_coll_base_alltoall_intra_basic_inplace(const void *rbuf, int rcount,
 
         /* Receive data from the right */
         err = MCA_PML_CALL(irecv ((char *) rbuf + right * rcount * extent, rcount, rdtype,
-                                  right, MCA_COLL_BASE_TAG_ALLTOALLW, comm, &req));
+                                  right, MCA_COLL_BASE_TAG_ALLTOALL, comm, &req));
         if (MPI_SUCCESS != err) { goto error_hndl; }
 
         if( left != right ) {
             /* Send data to the left */
             err = MCA_PML_CALL(send ((char *) rbuf + left * rcount * extent, rcount, rdtype,
-                                     left, MCA_COLL_BASE_TAG_ALLTOALLW, MCA_PML_BASE_SEND_STANDARD,
+                                     left, MCA_COLL_BASE_TAG_ALLTOALL, MCA_PML_BASE_SEND_STANDARD,
                                      comm));
             if (MPI_SUCCESS != err) { goto error_hndl; }
 
@@ -123,13 +123,13 @@ mca_coll_base_alltoall_intra_basic_inplace(const void *rbuf, int rcount,
 
             /* Receive data from the left */
             err = MCA_PML_CALL(irecv ((char *) rbuf + left * rcount * extent, rcount, rdtype,
-                                      left, MCA_COLL_BASE_TAG_ALLTOALLW, comm, &req));
+                                      left, MCA_COLL_BASE_TAG_ALLTOALL, comm, &req));
             if (MPI_SUCCESS != err) { goto error_hndl; }
         }
 
         /* Send data to the right */
         err = MCA_PML_CALL(send ((char *) tmp_buffer,  packed_size, MPI_PACKED,
-                                 right, MCA_COLL_BASE_TAG_ALLTOALLW, MCA_PML_BASE_SEND_STANDARD,
+                                 right, MCA_COLL_BASE_TAG_ALLTOALL, MCA_PML_BASE_SEND_STANDARD,
                                  comm));
         if (MPI_SUCCESS != err) { goto error_hndl; }
 

diff --git a/ompi/mca/coll/base/coll_base_alltoallv.c b/ompi/mca/coll/base/coll_base_alltoallv.c
@@ -55,7 +55,7 @@ mca_coll_base_alltoallv_intra_basic_inplace(const void *rbuf, const int *rcounts
 {
     int i, size, rank, left, right, err = MPI_SUCCESS, line;
     ptrdiff_t extent;
-    ompi_request_t *req;
+    ompi_request_t *req = MPI_REQUEST_NULL;
     char *tmp_buffer;
     size_t packed_size = 0, max_size;
     opal_convertor_t convertor;
@@ -113,7 +113,7 @@ mca_coll_base_alltoallv_intra_basic_inplace(const void *rbuf, const int *rcounts
             if (1 != err) { goto error_hndl; }
 
             /* Receive data from the right */
-            err = MCA_PML_CALL(irecv ((char *) rbuf + rdisps[right]  * extent, rcounts[right], rdtype,
+            err = MCA_PML_CALL(irecv ((char *) rbuf + rdisps[right] * extent, rcounts[right], rdtype,
                                       right, MCA_COLL_BASE_TAG_ALLTOALLV, comm, &req));
             if (MPI_SUCCESS != err) { goto error_hndl; }
         }