Revert "Update to sync with OMPI master and cleanup to build"

This reverts commit cb55c88a8b.

ompi/mca/coll/basic/coll_basic_scatter.c

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2016 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+#include "coll_basic.h"
+
+#include "mpi.h"
+#include "ompi/constants.h"
+#include "ompi/datatype/ompi_datatype.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
+#include "coll_basic.h"
+
+
+/*
+ *	scatter_inter
+ *
+ *	Function:	- scatter operation
+ *	Accepts:	- same arguments as MPI_Scatter()
+ *	Returns:	- MPI_SUCCESS or error code
+ */
+int
+mca_coll_basic_scatter_inter(const void *sbuf, int scount,
+                             struct ompi_datatype_t *sdtype,
+                             void *rbuf, int rcount,
+                             struct ompi_datatype_t *rdtype,
+                             int root, struct ompi_communicator_t *comm,
+                             mca_coll_base_module_t *module)
+{
+    int i, size, err;
+    char *ptmp;
+    ptrdiff_t lb, incr;
+    ompi_request_t **reqs;
+
+    /* Initialize */
+    size = ompi_comm_remote_size(comm);
+
+    if (MPI_PROC_NULL == root) {
+        /* do nothing */
+        err = OMPI_SUCCESS;
+    } else if (MPI_ROOT != root) {
+        /* If not root, receive data. */
+        err = MCA_PML_CALL(recv(rbuf, rcount, rdtype, root,
+                                MCA_COLL_BASE_TAG_SCATTER,
+                                comm, MPI_STATUS_IGNORE));
+    } else {
+        /* I am the root, loop sending data. */
+        err = ompi_datatype_get_extent(sdtype, &lb, &incr);
+        if (OMPI_SUCCESS != err) {
+            return OMPI_ERROR;
+        }
+
+        reqs = coll_base_comm_get_reqs(module->base_data, size);
+        if( NULL == reqs ) { return OMPI_ERR_OUT_OF_RESOURCE; }
+
+        incr *= scount;
+        for (i = 0, ptmp = (char *) sbuf; i < size; ++i, ptmp += incr) {
+            err = MCA_PML_CALL(isend(ptmp, scount, sdtype, i,
+                                     MCA_COLL_BASE_TAG_SCATTER,
+                                     MCA_PML_BASE_SEND_STANDARD, comm,
+                                     reqs++));
+            if (OMPI_SUCCESS != err) {
+                ompi_coll_base_free_reqs(reqs, i + 1);
+                return err;
+            }
+        }
+
+        err = ompi_request_wait_all(size, reqs, MPI_STATUSES_IGNORE);
+        if (OMPI_SUCCESS != err) {
+            ompi_coll_base_free_reqs(reqs, size);
+        }
+    }
+
+    return err;
+}