Skip to content

Commit 7191ea1

Browse files
committed
Fix merge conflict related to function renaming.
Signed-off-by: George Bosilca <[email protected]>
1 parent 2ab628b commit 7191ea1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ompi/mca/coll/base/coll_base_reduce_scatter_block.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ ompi_coll_base_reduce_scatter_block_intra_recursivehalving(
354354
OPAL_OUTPUT((ompi_coll_base_framework.framework_output,
355355
"coll:base:reduce_scatter_block_intra_recursivehalving: rank %d/%d "
356356
"switching to basic reduce_scatter_block", rank, comm_size));
357-
return ompi_coll_base_reduce_scatter_block_basic(sbuf, rbuf, rcount, dtype,
358-
op, comm, module);
357+
return ompi_coll_base_reduce_scatter_block_basic_linear(sbuf, rbuf, rcount, dtype,
358+
op, comm, module);
359359
}
360360
totalcount = comm_size * rcount;
361361
ompi_datatype_type_extent(dtype, &extent);

0 commit comments

Comments
 (0)