some additional rebase cleanup

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mca/coll/libnbc/nbc_ialltoall.c

@@ -77,40 +77,39 @@ static int nbc_alltoall_init(const void* sendbuf, int sendcount, MPI_Datatype se
   rank = ompi_comm_rank (comm);
   p = ompi_comm_size (comm);
 
+  res = ompi_datatype_type_extent(sendtype, &sndext);
+  if (MPI_SUCCESS != res) {
+    NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res);
+    return res;
+  }
+
   res = ompi_datatype_type_extent(recvtype, &rcvext);
   if (MPI_SUCCESS != res) {
     NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res);
     return res;
   }
 
+  res = ompi_datatype_type_size(sendtype, &sndsize);
+  if (MPI_SUCCESS != res) {
+    NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res);
+    return res;
+  }
+
+  /* algorithm selection */
+  a2asize = sndsize * sendcount * p;
+  /* this number is optimized for TCP on odin.cs.indiana.edu */
   if (inplace) {
     alg = NBC_A2A_INPLACE;
-  } else {
-    /* algorithm selection */
-    res = ompi_datatype_type_extent(sendtype, &sndext);
-    if (MPI_SUCCESS != res) {
-      NBC_Error("MPI Error in ompi_datatype_type_extent() (%i)", res);
-      return res;
-    }
-    res = ompi_datatype_type_size(sendtype, &sndsize);
-    if (MPI_SUCCESS != res) {
-      NBC_Error("MPI Error in ompi_datatype_type_size() (%i)", res);
-      return res;
-    }
-
-    a2asize = sndsize * sendcount * p;
-    /* this number is optimized for TCP on odin.cs.indiana.edu */
-    if((p <= 8) && ((a2asize < 1<<17) || (sndsize*sendcount < 1<<12))) {
-      /* just send as fast as we can if we have less than 8 peers, if the
-       * total communicated size is smaller than 1<<17 *and* if we don't
-       * have eager messages (msgsize < 1<<13) */
-      alg = NBC_A2A_LINEAR;
-    } else if(a2asize < (1<<12)*(unsigned int)p) {
-      /*alg = NBC_A2A_DISS;*/
-      alg = NBC_A2A_LINEAR;
-    } else
-      alg = NBC_A2A_LINEAR; /*NBC_A2A_PAIRWISE;*/
-  }
+  } else if((p <= 8) && ((a2asize < 1<<17) || (sndsize*sendcount < 1<<12))) {
+    /* just send as fast as we can if we have less than 8 peers, if the
+     * total communicated size is smaller than 1<<17 *and* if we don't
+     * have eager messages (msgsize < 1<<13) */
+    alg = NBC_A2A_LINEAR;
+  } else if(a2asize < (1<<12)*(unsigned int)p) {
+    /*alg = NBC_A2A_DISS;*/
+    alg = NBC_A2A_LINEAR;
+  } else
+    alg = NBC_A2A_LINEAR; /*NBC_A2A_PAIRWISE;*/
 
   /* allocate temp buffer if we need one */
   if (alg == NBC_A2A_INPLACE) {

ompi/mpi/c/bcast.c

@@ -76,14 +76,12 @@ int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype,
                                      FUNC_NAME);
       }
 
-      /* Errors for all involved ranks */
+      /* Errors for all ranks */
 
-      if (OMPI_COMM_IS_INTRA(comm) || MPI_PROC_NULL != root) {
-        OMPI_CHECK_DATATYPE_FOR_SEND(err, datatype, count);
-        OMPI_ERRHANDLER_CHECK(err, comm, err, FUNC_NAME);
-        if (MPI_IN_PLACE == buffer) {
+      OMPI_CHECK_DATATYPE_FOR_SEND(err, datatype, count);
+      OMPI_ERRHANDLER_CHECK(err, comm, err, FUNC_NAME);
+      if (MPI_IN_PLACE == buffer) {
           return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
-        }
       }
 
       /* Errors for intracommunicators */

ompi/mpi/c/ibcast.c

@@ -70,14 +70,12 @@ int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype,
                                      FUNC_NAME);
       }
 
-      /* Errors for all involved ranks */
+      /* Errors for all ranks */
 
-      if (OMPI_COMM_IS_INTRA(comm) || MPI_PROC_NULL != root) {
-        OMPI_CHECK_DATATYPE_FOR_SEND(err, datatype, count);
-        OMPI_ERRHANDLER_CHECK(err, comm, err, FUNC_NAME);
-        if (MPI_IN_PLACE == buffer) {
+      OMPI_CHECK_DATATYPE_FOR_SEND(err, datatype, count);
+      OMPI_ERRHANDLER_CHECK(err, comm, err, FUNC_NAME);
+      if (MPI_IN_PLACE == buffer) {
           return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
-        }
       }
 
       /* Errors for intracommunicators */