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

ompi/mca/bcol/basesmuma/bcol_basesmuma_allgather.c

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2009-2013 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -54,7 +54,6 @@ int bcol_basesmuma_k_nomial_allgather_init(bcol_function_args_t *input_args,
                                            struct coll_ml_function_t *const_args)
 {
     /* local variables */
-    /* XXX -- FIXME -- This is never set */
     int8_t  flag_offset;
     volatile int8_t ready_flag;
     mca_bcol_basesmuma_module_t *bcol_module = (mca_bcol_basesmuma_module_t *) const_args->bcol_module;
@@ -109,6 +108,8 @@ int bcol_basesmuma_k_nomial_allgather_init(bcol_function_args_t *input_args,
 
     /* Set pointer to current proc ctrl region */
     my_ctl_pointer = data_buffs[my_rank].ctl_struct;
+    /* NTH: copied from progress */
+    flag_offset = my_ctl_pointer->starting_flag_value[bcol_id];
 
     /* initialize headers and ready flag */
     BASESMUMA_HEADER_INIT(my_ctl_pointer, ready_flag, sequence_number, bcol_id);

ompi/mca/bcol/basesmuma/bcol_basesmuma_buf_mgmt.c

@@ -347,7 +347,7 @@ int bcol_basesmuma_bank_init_opti(struct mca_coll_ml_module_t *ml_module,
      */
 
     /* local variables */
-    int ret = OMPI_SUCCESS, i, j, k, l;
+    int ret = OMPI_SUCCESS, i, j;
     sm_buffer_mgmt *pload_mgmt;
     mca_bcol_basesmuma_component_t *cs = &mca_bcol_basesmuma_component;
     bcol_basesmuma_registration_data_t *sm_reg_data =

ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2009-2013 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -36,11 +36,6 @@ int bcol_basesmuma_reduce_init(mca_bcol_base_module_t *super)
     mca_bcol_base_coll_fn_comm_attributes_t comm_attribs;
     mca_bcol_base_coll_fn_invoke_attributes_t inv_attribs;
 
-    mca_bcol_basesmuma_module_t *basesmuma_module =
-        (mca_bcol_basesmuma_module_t *) super;
-
-    int group_size = basesmuma_module->colls_no_user_data.size_of_group;
-
     comm_attribs.bcoll_type = BCOL_REDUCE;
     comm_attribs.comm_size_min = 0;
     comm_attribs.comm_size_max = 16;

ompi/mca/coll/ml/coll_ml_allgather.c

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -330,7 +330,7 @@ int mca_coll_ml_allgather_start (void *sbuf, int scount,
     pack_len = scount * sdt_size;
 
     if (in_place) {
-        sbuf = rbuf + ompi_comm_rank(comm) * pack_len;
+        sbuf = (char *) rbuf + ompi_comm_rank(comm) * pack_len;
     }
 
     /* Allocate collective schedule and pack message */

ompi/mca/coll/ml/coll_ml_bcast.c

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -724,6 +724,7 @@ int mca_coll_ml_bcast_sequential_root(void *buf, int count, struct ompi_datatype
      * on this stage only contiguous data is supported */
     ompi_datatype_type_size(dtype, &dt_size);
     pack_len = count * dt_size;
+    ompi_datatype_get_extent (dtype, &lb, &extent);
 
     actual_buf = (void *) ((uintptr_t) buf + lb);