Adding entry points for Allgatherv, iAllgatherv, Reduce, and iReduce.

Signed-off-by: Joshua Ladd <jladd.mlnx@gmail.com> Conflicts: ompi/mca/coll/hcoll/coll_hcoll.h ompi/mca/coll/hcoll/coll_hcoll_ops.c
open-mpi · Jan 26, 2016 · 8a2bc95 · 8a2bc95
1 parent 1e011bf
commit 8a2bc95
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/ompi/mca/coll/hcoll/coll_hcoll_ops.c b/ompi/mca/coll/hcoll/coll_hcoll_ops.c
@@ -284,7 +284,6 @@ int mca_coll_hcoll_reduce(const void *sbuf, void *rbuf, int count,
 }
 
 int mca_coll_hcoll_alltoall(const void *sbuf, int scount,
->>>>>>> e398bf6... Adding entry points for Allgatherv, iAllgatherv, Reduce, and iReduce.
                            struct ompi_datatype_t *sdtype,
                            void* rbuf, int rcount,
                            struct ompi_datatype_t *rdtype,
@@ -547,7 +546,6 @@ int mca_coll_hcoll_iallgatherv(const void *sbuf, int scount,
 }
 #endif
 int mca_coll_hcoll_iallreduce(const void *sbuf, void *rbuf, int count,
->>>>>>> e398bf6... Adding entry points for Allgatherv, iAllgatherv, Reduce, and iReduce.
                             struct ompi_datatype_t *dtype,
                             struct ompi_op_t *op,
                             struct ompi_communicator_t *comm,