Skip to content

Commit f279474

Browse files
committed
Fix intercommunicator split (was triggered by MPICH/icsend test)
1 parent 04fc406 commit f279474

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ompi/communicator/comm.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ int ompi_comm_set_nb ( ompi_communicator_t **ncomm,
180180
if (0 < remote_size) {
181181
ompi_communicator_t *old_localcomm;
182182

183-
if (NULL == remote_group || &ompi_mpi_group_null.group == remote_group) {
183+
if (NULL == remote_group) {
184184
ret = ompi_group_incl(oldcomm->c_remote_group, remote_size,
185185
remote_ranks, &newcomm->c_remote_group);
186186
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
@@ -432,7 +432,7 @@ int ompi_comm_split( ompi_communicator_t* comm, int color, int key,
432432
int rc=OMPI_SUCCESS;
433433
ompi_communicator_t *newcomp = NULL;
434434
int *lranks=NULL, *rranks=NULL;
435-
ompi_group_t * local_group=NULL, * remote_group=NULL;
435+
ompi_group_t * local_group=NULL;
436436

437437
ompi_comm_allgatherfct *allgatherfct=NULL;
438438

@@ -508,7 +508,6 @@ int ompi_comm_split( ompi_communicator_t* comm, int color, int key,
508508
/* Step 2: determine all the information for the remote group */
509509
/* --------------------------------------------------------- */
510510
if ( inter ) {
511-
remote_group = &ompi_mpi_group_null.group;
512511
rsize = comm->c_remote_group->grp_proc_count;
513512
rresults = (int *) malloc ( rsize * 2 * sizeof(int));
514513
if ( NULL == rresults ) {
@@ -592,7 +591,7 @@ int ompi_comm_split( ompi_communicator_t* comm, int color, int key,
592591
comm->error_handler,/* error handler */
593592
pass_on_topo,
594593
local_group, /* local group */
595-
remote_group); /* remote group */
594+
NULL); /* remote group */
596595

597596
if ( NULL == newcomp ) {
598597
rc = MPI_ERR_INTERN;

0 commit comments

Comments
 (0)