Merge pull request #3836 from rhc54/topic/ofi

Bring the ofi/rml component online

Author: Ralph Castain

contrib/platform/intel/bend/linux

@@ -11,7 +11,7 @@ enable_shared=yes
 enable_static=no
 enable_memchecker=no
 enable_ipv6=no
-enable_mpi_fortran=yes
+enable_mpi_fortran=no
 enable_mpi_cxx=no
 enable_mpi_cxx_seek=no
 enable_cxx_exceptions=no

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -13,8 +13,8 @@
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.
 
-major=2
-minor=1
+major=3
+minor=0
 release=0
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git4714f20
+repo_rev=gitd26d689
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Jul 20, 2017"
+date="Jul 06, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix2x/pmix/config/pmix_setup_libevent.m4

@@ -3,8 +3,6 @@
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
 # Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
-# Copyright (c) 2017      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -41,11 +39,8 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
     AC_MSG_CHECKING([for libevent])
     AC_MSG_RESULT([assumed available (embedded mode)])
 
-    AS_IF([test -z "$with_libevent_header" || test "$with_libevent_header" = "yes"],
-          [PMIX_EVENT_HEADER="<event.h>"
-           PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"],
-          [PMIX_EVENT_HEADER="$with_libevent_header"
-           PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"])
+    PMIX_EVENT_HEADER="$with_libevent_header"
+    PMIX_EVENT2_THREAD_HEADER="$with_libevent_header"
 
  ])
 

opal/mca/pmix/pmix2x/pmix/src/buffer_ops/internal_functions.c

@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2006 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-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2017      Los Alamos National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <src/include/pmix_config.h>
+
+
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "src/class/pmix_pointer_array.h"
+
+#include "src/buffer_ops/internal.h"
+
+/**
+ * Internal function that resizes (expands) an inuse buffer if
+ * necessary.
+ */
+char* pmix_bfrop_buffer_extend(pmix_buffer_t *buffer, size_t bytes_to_add)
+{
+    size_t required, to_alloc;
+    size_t pack_offset, unpack_offset;
+    char *tmp;
+
+    /* Check to see if we have enough space already */
+
+    if ((buffer->bytes_allocated - buffer->bytes_used) >= bytes_to_add) {
+        return buffer->pack_ptr;
+    }
+
+    required = buffer->bytes_used + bytes_to_add;
+    if (required >= pmix_bfrop_threshold_size) {
+        to_alloc = (required + pmix_bfrop_threshold_size - 1) & ~(pmix_bfrop_threshold_size - 1);
+    } else {
+        to_alloc = buffer->bytes_allocated ? buffer->bytes_allocated : pmix_bfrop_initial_size;
+        while(to_alloc < required) {
+            to_alloc <<= 1;
+        }
+    }
+
+    pack_offset = ((char*) buffer->pack_ptr) - ((char*) buffer->base_ptr);
+    unpack_offset = ((char*) buffer->unpack_ptr) - ((char*) buffer->base_ptr);
+    tmp = (char*)realloc(buffer->base_ptr, to_alloc);
+    if (NULL == tmp) {
+        return NULL;
+    }
+
+    buffer->base_ptr = tmp;
+
+    /* This memset is meant to keep valgrind happy. If possible it should be removed
+     * in the future. */
+    memset(buffer->base_ptr + pack_offset, 0, to_alloc - buffer->bytes_allocated);
+
+    buffer->pack_ptr = ((char*) buffer->base_ptr) + pack_offset;
+    buffer->unpack_ptr = ((char*) buffer->base_ptr) + unpack_offset;
+    buffer->bytes_allocated = to_alloc;
+
+    /* All done */
+
+    return buffer->pack_ptr;
+}
+
+/*
+ * Internal function that checks to see if the specified number of bytes
+ * remain in the buffer for unpacking
+ */
+bool pmix_bfrop_too_small(pmix_buffer_t *buffer, size_t bytes_reqd)
+{
+    size_t bytes_remaining_packed;
+
+    if (buffer->pack_ptr < buffer->unpack_ptr) {
+        return true;
+    }
+
+    bytes_remaining_packed = buffer->pack_ptr - buffer->unpack_ptr;
+
+    if (bytes_remaining_packed < bytes_reqd) {
+        /* don't error log this - it could be that someone is trying to
+         * simply read until the buffer is empty
+         */
+        return true;
+    }
+
+    return false;
+}
+
+pmix_status_t pmix_bfrop_store_data_type(pmix_buffer_t *buffer, pmix_data_type_t type)
+{
+    /* Lookup the pack function for the actual pmix_data_type type and call it */
+    return pmix_bfrop_pack_datatype(buffer, &type, 1, PMIX_DATA_TYPE);
+}
+
+pmix_status_t pmix_bfrop_get_data_type(pmix_buffer_t *buffer, pmix_data_type_t *type)
+{
+    int32_t cnt = 1;
+
+    return pmix_bfrop_unpack_datatype(buffer, type, &cnt, PMIX_DATA_TYPE);
+}

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c

@@ -270,8 +270,11 @@ static void _getnb_cbfunc(struct pmix_peer_t *pr,
     pmix_status_t rc, ret;
     pmix_value_t *val = NULL;
     int32_t cnt;
-    pmix_proc_t proc;
+    pmix_proc_t proc, proct;
+    pmix_byte_object_t bo;
+    pmix_buffer_t pbkt;
     pmix_kval_t *kv;
+    pmix_peer_t *peer;
 
     pmix_output_verbose(2, pmix_globals.debug_output,
                         "pmix: get_nb callback recvd");
@@ -299,9 +302,82 @@ static void _getnb_cbfunc(struct pmix_peer_t *pr,
     if (PMIX_SUCCESS != ret) {
         goto done;
     }
-    PMIX_GDS_ACCEPT_KVS_RESP(rc, pmix_client_globals.myserver, buf);
-    if (PMIX_SUCCESS != rc) {
-        goto done;
+
+    /* the incoming payload is provided as a set of packed
+     * byte objects, one for each rank. A pmix_proc_t is the first
+     * entry in the byte object. If the rank=PMIX_RANK_WILDCARD,
+     * then that byte object contains job level info
+     * for the provided nspace. Otherwise, the byte
+     * object contains the pmix_kval_t's that were "put" by the
+     * referenced process */
+    cnt = 1;
+    PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,
+                       buf, &bo, &cnt, PMIX_BYTE_OBJECT);
+    while (PMIX_SUCCESS == rc) {
+        /* setup the byte object for unpacking */
+        PMIX_CONSTRUCT(&pbkt, pmix_buffer_t);
+        PMIX_LOAD_BUFFER(pmix_client_globals.myserver,
+                         &pbkt, bo.bytes, bo.size);
+        /* unpack the id of the providing process */
+        cnt = 1;
+        PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,
+                           &pbkt, &proct, &cnt, PMIX_PROC);
+        if (PMIX_SUCCESS != rc) {
+            PMIX_ERROR_LOG(rc);
+            goto done;
+        }
+        /* if the rank is WILDCARD, then the byte object contains
+         * job-level data. Note that we can get job-level data
+         * for a "get" request that referenced a specific non-wildcard
+         * rank - this happens in the case where the nspace is
+         * different than that of the requestor. We may also be
+         * in a situation where the data for -all- ranks on a
+         * remote node is being returned by a request for data
+         * from only one of them - this can occur as an optimization.
+         * So we have to check the rank here as it may not match the rank of
+         * the requestor */
+        if (PMIX_RANK_WILDCARD == proct.rank) {
+            peer = pmix_client_globals.myserver;  // job-level data is accessed via the server module
+        } else {
+            peer = pmix_globals.mypeer;   // all other data is stored on my peer module
+        }
+        cnt = 1;
+        kv = PMIX_NEW(pmix_kval_t);
+        PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,
+                           &pbkt, kv, &cnt, PMIX_KVAL);
+        while (PMIX_SUCCESS == rc) {
+            /* let the GDS component for this peer store it - if
+             * the kval contains shmem connection info, then the
+             * component will know what to do about it (or else
+             * we selected the wrong component for this peer!) */
+            PMIX_GDS_STORE_KV(rc, peer, &proct, PMIX_INTERNAL, kv);
+            if (PMIX_SUCCESS != rc) {
+                PMIX_ERROR_LOG(rc);
+                PMIX_RELEASE(kv);
+                PMIX_DESTRUCT(&pbkt);
+                goto done;
+            }
+            PMIX_RELEASE(kv);  // maintain accounting
+            /* get the next one */
+            kv = PMIX_NEW(pmix_kval_t);
+            cnt = 1;
+            PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,
+                               &pbkt, kv, &cnt, PMIX_KVAL);
+        }
+        PMIX_RELEASE(kv);  // maintain accounting
+        if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+            PMIX_ERROR_LOG(rc);
+            PMIX_DESTRUCT(&pbkt);
+            goto done;
+        }
+        PMIX_DESTRUCT(&pbkt);
+        /* get the next one */
+        cnt = 1;
+        PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,
+                           buf, &bo, &cnt, PMIX_BYTE_OBJECT);
+        }
+    if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
+        PMIX_ERROR_LOG(rc);
     }
 
   done:
@@ -315,7 +391,7 @@ static void _getnb_cbfunc(struct pmix_peer_t *pr,
            /* we have the data for this proc - see if we can find the key */
             cb->proc = &proc;
             cb->scope = PMIX_SCOPE_UNDEF;
-            /* fetch the data from server peer module - since it is passing
+            /* fetch the data from my peer module - since we are passing
              * it back to the user, we need a copy of it */
             cb->copy = true;
             PMIX_GDS_FETCH_KV(rc, pmix_client_globals.myserver, cb);
@@ -410,6 +486,7 @@ static void _getnbfn(int fd, short flags, void *cbdata)
     pmix_proc_t proc;
     bool optional = false;
     struct timeval tv;
+    bool my_nspace = false, my_rank = false;
 
     /* cb was passed to us from another thread - acquire it */
     PMIX_ACQUIRE_OBJECT(cb);
@@ -448,13 +525,22 @@ static void _getnbfn(int fd, short flags, void *cbdata)
         }
     }
 
-    /* check the internal storage first */
-    cb->proc = &proc;
-    cb->copy = true;
-    PMIX_GDS_FETCH_KV(rc, pmix_globals.mypeer, cb);
-    if (PMIX_SUCCESS == rc) {
-        rc = process_values(&val, cb);
-        goto respond;
+    my_nspace = (0 == strncmp(cb->pname.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN));
+    my_rank = (pmix_globals.myid.rank == cb->pname.rank);
+
+    /* if we are looking for data from ourselves, then
+     * check the internal storage first */
+    if (my_rank) {
+        cb->proc = &proc;
+        cb->copy = true;
+        PMIX_GDS_FETCH_KV(rc, pmix_globals.mypeer, cb);
+        if (PMIX_SUCCESS == rc) {
+            rc = process_values(&val, cb);
+            goto respond;
+        }
+        if (my_nspace) {
+            goto respond;
+        }
     }
 
     /* if the key is NULL or starts with "pmix", then they are looking
@@ -466,7 +552,7 @@ static void _getnbfn(int fd, short flags, void *cbdata)
         cb->copy = true;
         PMIX_GDS_FETCH_KV(rc, pmix_client_globals.myserver, cb);
         if (PMIX_SUCCESS != rc) {
-            if (0 != strncmp(cb->pname.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN)) {
+            if (!my_nspace) {
                 /* we are asking about the job-level info from another
                  * namespace. It seems that we don't have it - go and
                  * ask server