Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 693d2d1

Browse files
bosilcaderbeyn
authored andcommitted
Fix issues identified by @derbeyn.
(cherry picked from commit 004c0cc)
1 parent 24bf5e7 commit 693d2d1

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

ompi/mca/coll/base/coll_base_alltoallv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ ompi_coll_base_alltoallv_intra_basic_linear(const void *sbuf, const int *scounts
286286
* So free them anyway -- even if there was an error, and return the
287287
* error after we free everything. */
288288
err = ompi_request_wait_all(nreqs, reqs, MPI_STATUSES_IGNORE);
289-
if( MPI_SUCCESS == err )
290-
return MPI_SUCCESS;
289+
291290
err_hndl:
292291
/* Free the requests in all cases as they are persistent */
293292
ompi_coll_base_free_reqs(reqs, nreqs);

ompi/mca/coll/basic/coll_basic_alltoall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ mca_coll_basic_alltoall_inter(const void *sbuf, int scount,
100100
MCA_COLL_BASE_TAG_ALLTOALL,
101101
MCA_PML_BASE_SEND_STANDARD, comm, sreq));
102102
if (OMPI_SUCCESS != err) {
103-
ompi_coll_base_free_reqs(req, i + 1);
103+
ompi_coll_base_free_reqs(req, i + size + 1);
104104
return err;
105105
}
106106
}

ompi/mca/coll/basic/coll_basic_neighbor_allgather.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ mca_coll_basic_neighbor_allgather_dist_graph(const void *sbuf, int scount,
219219

220220
rc = ompi_request_wait_all (indegree + outdegree, reqs, MPI_STATUSES_IGNORE);
221221
if (OMPI_SUCCESS != rc) {
222-
ompi_coll_base_free_reqs(reqs, indegree + outdegree + 1);
222+
ompi_coll_base_free_reqs(reqs, indegree + outdegree);
223223
}
224224
return rc;
225225
}

0 commit comments

Comments
 (0)