Merge branch 'master' into fix/alpsinfov3

ompi/mca/mtl/portals4/mtl_portals4_recv.c

@@ -39,26 +39,8 @@ read_msg(void *start, ptl_size_t length, ptl_process_t target,
          ptl_match_bits_t match_bits, ptl_size_t remote_offset,
          ompi_mtl_portals4_recv_request_t *request)
 {
-    ptl_md_t md;
     int ret;
 
-    /* FIX ME: This needs to be on the send eq... */
-    md.start = start;
-    md.length = length;
-    md.options = 0;
-    md.eq_handle = ompi_mtl_portals4.send_eq_h;
-    md.ct_handle = PTL_CT_NONE;
-
-    ret = PtlMDBind(ompi_mtl_portals4.ni_h,
-                    &md,
-                    &request->md_h);
-    if (OPAL_UNLIKELY(PTL_OK != ret)) {
-        opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
-                            "%s:%d: PtlMDBind failed: %d",
-                            __FILE__, __LINE__, ret);
-        return OMPI_ERR_OUT_OF_RESOURCE;
-    }
-
 #if OMPI_MTL_PORTALS4_FLOW_CONTROL
     while (OPAL_UNLIKELY(OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, -1) < 0)) {
         OPAL_THREAD_ADD32(&ompi_mtl_portals4.flowctl.send_slots, 1);
@@ -66,9 +48,9 @@ read_msg(void *start, ptl_size_t length, ptl_process_t target,
     }
 #endif
 
-    ret = PtlGet(request->md_h,
-                 0,
-                 md.length,
+    ret = PtlGet(ompi_mtl_portals4.send_md_h,
+                 (ptl_size_t) start,
+                 length,
                  target,
                  ompi_mtl_portals4.read_idx,
                  match_bits,
@@ -78,7 +60,6 @@ read_msg(void *start, ptl_size_t length, ptl_process_t target,
         opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
                             "%s:%d: PtlGet failed: %d",
                             __FILE__, __LINE__, ret);
-        PtlMDRelease(request->md_h);
         return OMPI_ERR_OUT_OF_RESOURCE;
     }
 
@@ -178,7 +159,6 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
             opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
                                 "%s:%d: PTL_EVENT_REPLY with ni_fail_type: %d",
                                 __FILE__, __LINE__, ev->ni_fail_type);
-            PtlMDRelease(ptl_request->md_h);
             goto callback_error;
         }
 
@@ -208,7 +188,6 @@ ompi_mtl_portals4_recv_progress(ptl_event_t *ev,
                                 __FILE__, __LINE__, ret);
             ptl_request->super.super.ompi_req->req_status.MPI_ERROR = ret;
         }
-        PtlMDRelease(ptl_request->md_h);
 
         OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_framework.framework_output,
                              "Recv %lu (0x%lx) completed, reply",

ompi/mca/mtl/portals4/mtl_portals4_request.h

@@ -68,7 +68,6 @@ typedef struct ompi_mtl_portals4_send_request_t ompi_mtl_portals4_send_request_t
 struct ompi_mtl_portals4_recv_request_t {
     ompi_mtl_portals4_base_request_t super;
     void *buffer_ptr;
-    ptl_handle_md_t md_h;
     ptl_handle_me_t me_h;
     struct opal_convertor_t *convertor;
     void *delivery_ptr;

orte/runtime/orte_globals.c

@@ -469,6 +469,12 @@ char* orte_get_proc_hostname(orte_process_name_t *proc)
     char *hostname = NULL;
     int rc;
 
+    /* if we are a tool, then we have no way of obtaining
+     * this info */
+    if (ORTE_PROC_IS_TOOL) {
+        return NULL;
+    }
+
     /* don't bother error logging any not-found situations
      * as the layer above us will have something to say
      * about it */

orte/tools/orte-submit/orte-submit.1in

@@ -904,13 +904,13 @@ the following additional options:
  [...] ... binding child [...,2] to cpus 0004
  [...] ... binding child [...,3] to cpus 0008
 
- % ompi-submit ... --map-by socket -0bind-to socket
+ % ompi-submit ... --map-by socket --bind-to socket
  [...] ... binding child [...,0] to socket 0 cpus 000f
  [...] ... binding child [...,1] to socket 1 cpus 00f0
  [...] ... binding child [...,2] to socket 0 cpus 000f
  [...] ... binding child [...,3] to socket 1 cpus 00f0
 
- % ompi-submit ... --map-by core:PE=2 -bind-to core
+ % ompi-submit ... --map-by core:PE=2 --bind-to core
  [...] ... binding child [...,0] to cpus 0003
  [...] ... binding child [...,1] to cpus 000c
  [...] ... binding child [...,2] to cpus 0030

orte/tools/orterun/orterun.1in

@@ -1011,13 +1011,13 @@ the following additional options:
  [...] ... binding child [...,2] to cpus 0004
  [...] ... binding child [...,3] to cpus 0008
 
- % mpirun ... --map-by socket -0bind-to socket
+ % mpirun ... --map-by socket --bind-to socket
  [...] ... binding child [...,0] to socket 0 cpus 000f
  [...] ... binding child [...,1] to socket 1 cpus 00f0
  [...] ... binding child [...,2] to socket 0 cpus 000f
  [...] ... binding child [...,3] to socket 1 cpus 00f0
 
- % mpirun ... --map-by core:PE=2 -bind-to core
+ % mpirun ... --map-by core:PE=2 --bind-to core
  [...] ... binding child [...,0] to cpus 0003
  [...] ... binding child [...,1] to cpus 000c
  [...] ... binding child [...,2] to cpus 0030