Nathan Hjelm 82d996fb76 coll/ml: cleanup some merge related errors ...

cmr=v1.7.5:ticket=trac:4158

This commit was SVN r30366.

The following Trac tickets were found above:
  Ticket 4158 --> https://svn.open-mpi.org/trac/ompi/ticket/4158

2014-01-22 16:48:09 +00:00

..

bcol_basesmuma_allgather.c

coll/ml: cleanup some merge related errors

2014-01-22 16:48:09 +00:00

bcol_basesmuma_allreduce.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_bcast_prime.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_bcast.c

Per Marco, rename ERROR tags to exit_ERROR to avoid cygwin reserved name issues.

2014-01-10 18:00:49 +00:00

bcol_basesmuma_buf_mgmt.c

coll/ml: cleanup some merge related errors

2014-01-22 16:48:09 +00:00

bcol_basesmuma_component.c

Per Marco, rename ERROR tags to exit_ERROR to avoid cygwin reserved name issues.

2014-01-10 18:00:49 +00:00

bcol_basesmuma_fanin.c

Moving mca/common/netpatterns and commpaterns to ompi/patterns.

2013-02-05 21:52:55 +00:00

bcol_basesmuma_fanout.c

Moving mca/common/netpatterns and commpaterns to ompi/patterns.

2013-02-05 21:52:55 +00:00

bcol_basesmuma_gather.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_lmsg_bcast.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_lmsg_bcast.h

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_lmsg_knomial_bcast.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_mem_mgmt.c

Adding Hierarchical Collectives project to the Open MPI trunk.

2012-08-16 19:11:35 +00:00

bcol_basesmuma_module.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_progress.c

More warnings clean up in the collectives code on behalf of Joshua Ladd. Refs trac:3243.

2012-08-17 17:05:31 +00:00

bcol_basesmuma_rd_barrier.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_rd_nb_barrier.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_reduce.c

coll/ml: cleanup some merge related errors

2014-01-22 16:48:09 +00:00

bcol_basesmuma_reduce.h

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_rk_barrier.c

Moving mca/common/netpatterns and commpaterns to ompi/patterns.

2013-02-05 21:52:55 +00:00

bcol_basesmuma_setup.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_smcm.c

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

bcol_basesmuma_smcm.h

Remove all remaining vestiges of the Windows integration

2013-02-28 17:31:47 +00:00

bcol_basesmuma_utils.c

Adding Hierarchical Collectives project to the Open MPI trunk.

2012-08-16 19:11:35 +00:00

bcol_basesmuma_utils.h

Move the RTE framework change into the trunk. With this change, all non-CR

2013-01-27 23:25:10 +00:00

bcol_basesmuma.h

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00

Makefile.am

coll/ml: add support for blocking and non-blocking allreduce, reduce, and

2014-01-22 15:39:19 +00:00