Skip to content

Commit 36f4eba

Browse files
hppritchahppritcha
committed
SQUASHME: co-pilot feedback
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent fb2e8f1 commit 36f4eba

File tree

8 files changed

+31
-14
lines changed

8 files changed

+31
-14
lines changed

‎ompi/mca/coll/base/coll_base_util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ int ompi_coll_base_run_release_arrays_cb(ompi_request_t *req)
358358
if (req->req_persistent && (NULL == req->req_free)) {
359359
request->cb.req_free = req->req_free;
360360
req->req_free = free_objs_callback;
361-
} else if(NULL != req->req_complete_cb) {
361+
} else if (NULL == req->req_complete_cb) {
362362
request->cb.req_complete_cb = req->req_complete_cb;
363363
request->req_complete_cb_data = req->req_complete_cb_data;
364364
req->req_complete_cb = complete_objs_callback;

‎ompi/mpi/fortran/mpif-h/allgatherv_init_f.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ void ompi_allgatherv_init_f(char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendty
108108
if (MPI_SUCCESS == ierr_c) {
109109
*request = PMPI_Request_c2f(c_request);
110110
if ((void *)recvcounts != (void *)OMPI_ARRAY_NAME_CONVERT(recvcounts)) {
111-
ompi_coll_base_append_array_to_release(c_request,OMPI_ARRAY_NAME_CONVERT(recvcounts));
112-
ompi_coll_base_append_array_to_release(c_request,OMPI_ARRAY_NAME_CONVERT(displs));
111+
ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(recvcounts));
112+
ompi_coll_base_append_array_to_release(c_request, OMPI_ARRAY_NAME_CONVERT(displs));
113113
ompi_coll_base_run_release_arrays_cb(c_request);
114114
}
115115
} else {

‎ompi/mpi/fortran/use-mpi-f08/alltoallv_init_ts.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ PROTOTYPE VOID alltoallv_init(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts, DISP_ARRA
8686
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
8787
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
8888
if (idx > 0) {
89-
ompi_coll_base_run_release_arrays_cb(c_request);
89+
ompi_coll_base_run_release_arrays_cb(c_request);
9090
}
9191
}

‎ompi/mpi/fortran/use-mpi-f08/alltoallw_init_ts.c.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ PROTOTYPE VOID alltoallw_init(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
9292
}
9393
ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
9494
ompi_coll_base_run_release_arrays_cb(c_request);
95+
} else {
96+
free(c_recvtypes);
97+
if (NULL != c_sendtypes) {
98+
free(c_sendtypes);
99+
}
95100
}
96101

97102
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);

‎ompi/mpi/fortran/use-mpi-f08/ialltoallw_ts.c.in‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PROTOTYPE VOID ialltoallw(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
2828
COMM comm, REQUEST_OUT request)
2929
{
3030
MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
31-
MPI_Datatype *c_sendtypes = NULL, *c_recvtypes;
31+
MPI_Datatype *c_sendtypes = NULL, *c_recvtypes = NULL;
3232
MPI_Request c_request;
3333
int size, idx = 0, c_ierr;
3434
char *sendbuf = OMPI_CFI_BASE_ADDR(x1), *recvbuf = OMPI_CFI_BASE_ADDR(x2);
@@ -80,15 +80,24 @@ PROTOTYPE VOID ialltoallw(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
8080
tmp_rdispls,
8181
c_recvtypes, c_comm, &c_request);
8282
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
83-
if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
83+
if (MPI_SUCCESS == c_ierr) {
84+
*request = PMPI_Request_c2f(c_request);
85+
ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
86+
if (NULL != c_sendtypes) {
87+
ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
88+
}
89+
} else {
90+
free(c_recvtypes);
91+
if (NULL != c_sendtypes) {
92+
free(c_sendtypes);
93+
}
94+
}
8495

8596
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);
8697
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sdispls, tmp_sdispls, c_request, c_ierr, idx);
87-
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);;
98+
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
8899
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);
89-
ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
90-
if (NULL != c_sendtypes) {
91-
ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
100+
if (idx > 0) {
101+
ompi_coll_base_run_release_arrays_cb(c_request);
92102
}
93-
ompi_coll_base_run_release_arrays_cb(c_request);
94103
}

‎ompi/mpi/fortran/use-mpi-f08/ineighbor_alltoallv_ts.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ PROTOTYPE VOID ineighbor_alltoallv(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts, DISP
7676
if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
7777
if (MPI_SUCCESS == c_ierr) *request = PMPI_Request_c2f(c_request);
7878

79-
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts,c_request, c_ierr, idx);
79+
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);
8080
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sdispls, tmp_sdispls, c_request, c_ierr, idx);
8181
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);
8282
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(rdispls, tmp_rdispls, c_request, c_ierr, idx);

‎ompi/mpi/fortran/use-mpi-f08/iscatterv_ts.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ PROTOTYPE VOID iscatterv(BUFFER_ASYNC x1, COUNT_ARRAY sendcounts,
107107
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(sendcounts, tmp_sendcounts, c_request, c_ierr, idx);
108108
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(displs, tmp_displs, c_request, c_ierr, idx);
109109
if (idx > 0) {
110-
ompi_coll_base_run_release_arrays_cb(c_request);
110+
ompi_coll_base_run_release_arrays_cb(c_request);
111111
}
112112
}

‎ompi/mpi/fortran/use-mpi-f08/neighbor_alltoallw_init_ts.c.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROTOTYPE VOID neighbor_alltoallw_init(BUFFER x1, COUNT_ARRAY sendcounts,
3333
REQUEST_OUT request)
3434
{
3535
MPI_Comm c_comm = PMPI_Comm_f2c(*comm);
36-
MPI_Datatype *c_sendtypes, *c_recvtypes;
36+
MPI_Datatype *c_sendtypes = NULL, *c_recvtypes = NULL;
3737
MPI_Request c_request;
3838
MPI_Info c_info;
3939
int size, c_ierr, idx = 0;
@@ -93,6 +93,9 @@ PROTOTYPE VOID neighbor_alltoallw_init(BUFFER x1, COUNT_ARRAY sendcounts,
9393
ompi_coll_base_append_array_to_release(c_request, c_sendtypes);
9494
ompi_coll_base_append_array_to_release(c_request, c_recvtypes);
9595
ompi_coll_base_run_release_arrays_cb(c_request);
96+
} else {
97+
free(c_recvtypes);
98+
free(c_sendtypes);
9699
}
97100

98101
OMPI_FORTRAN_BIGCOUNT_ARRAY_CLEANUP_NONBLOCKING(recvcounts, tmp_recvcounts, c_request, c_ierr, idx);

0 commit comments

Comments
 (0)