ports/openmpi
ports/openmpi
1
1
Fork 0
Code Releases Activity

Merge pull request #5171 from bosilca/topic/fix_merge

Browse Source 
Fix merge conflict related to function renaming.
This commit is contained in:
bosilca 2018-05-15 14:14:10 -04:00 committed by GitHub
commit d72c4e9d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ompi/mca/coll/base/coll_base_reduce_scatter_block.c
View File

@ -354,8 +354,8 @@ ompi_coll_base_reduce_scatter_block_intra_recursivehalving(
OPAL_OUTPUT((ompi_coll_base_framework.framework_output,
"coll:base:reduce_scatter_block_intra_recursivehalving: rank %d/%d "
"switching to basic reduce_scatter_block", rank, comm_size));
return ompi_coll_base_reduce_scatter_block_basic(sbuf, rbuf, rcount, dtype,
op, comm, module);
return ompi_coll_base_reduce_scatter_block_basic_linear(sbuf, rbuf, rcount, dtype,
op, comm, module);
}
totalcount = comm_size * rcount;
ompi_datatype_type_extent(dtype, &extent);