Merge pull request #5486 from rhc54/cmr40/maps

Cleanup pmix selection and map-by modifiers

opal/mca/pmix/ext2x/ext2x_component.c

@@ -118,12 +118,12 @@ static int external_open(void)
     OBJ_CONSTRUCT(&mca_pmix_ext2x_component.dmdx, opal_list_t);
 
     version = PMIx_Get_version();
-    if ('2' != version[0]) {
+    if ('2' > version[0]) {
         opal_show_help("help-pmix-base.txt",
                        "incorrect-pmix", true, version, "v2.x");
         return OPAL_ERROR;
     }
-    if (0 == strncmp(version, "2.1", 3)) {
+    if (0 != strncmp(version, "2.0", 3)) {
         mca_pmix_ext2x_component.legacy_get = false;
     }
 

opal/mca/pmix/pmix3x/pmix3x_component.c

@@ -118,7 +118,7 @@ static int external_open(void)
     OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.dmdx, opal_list_t);
 
     version = PMIx_Get_version();
-    if ('3' != version[0]) {
+    if ('3' > version[0]) {
         opal_show_help("help-pmix-base.txt",
                        "incorrect-pmix", true, version, "v3.x");
         return OPAL_ERROR;

orte/mca/rmaps/base/rmaps_base_frame.c

@@ -597,7 +597,7 @@ int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
                                        char **device, char *inspec)
 {
     char *ck;
-    char *ptr;
+    char *ptr, *cptr;
     orte_mapping_policy_t tmp;
     int rc;
     size_t len;
@@ -661,20 +661,26 @@ int orte_rmaps_base_set_mapping_policy(orte_mapping_policy_t *policy,
                     return ORTE_ERR_SILENT;
                 }
                 ptr++; // move past the colon
-                /* check the remaining string for modifiers - may be none, so
+                /* at this point, ck is pointing to the number of procs/object
-                 * don't emit an error message if the modifier isn't recognized
+                 * and ptr is pointing to the beginning of the string that describes
-                 */
+                 * the object plus any modifiers. We first check to see if there
-                if (ORTE_ERR_SILENT == (rc = check_modifiers(ptr, &tmp)) &&
+                 * is a comma indicating that there are modifiers to the request */
+                if (NULL != (cptr = strchr(ptr, ','))) {
+                    /* there are modifiers, so we terminate the object string
+                     * at the location of the first comma */
+                    *cptr = '\0';
+                    /* step over that comma */
+                    cptr++;
+                    /* now check for modifiers  - may be none, so
+                     * don't emit an error message if the modifier
+                     * isn't recognized */
+                    if (ORTE_ERR_SILENT == (rc = check_modifiers(cptr, &tmp)) &&
                         ORTE_ERR_BAD_PARAM != rc) {
                         free(spec);
                         return ORTE_ERR_SILENT;
                     }
-                /* if we found something, then we need to adjust the string */
-                if (ORTE_SUCCESS == rc) {
-                    ptr--;
-                    *ptr = '\0';
                 }
-                /* now get the pattern */
+                /* now save the pattern */
                 orte_rmaps_base.ppr = strdup(ck);
                 ORTE_SET_MAPPING_POLICY(tmp, ORTE_MAPPING_PPR);
                 ORTE_SET_MAPPING_DIRECTIVE(tmp, ORTE_MAPPING_GIVEN);

orte/runtime/data_type_support/orte_dt_print_fns.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -442,9 +442,12 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
  */
 int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_type_t type)
 {
-    char *tmp, *tmp2, *pfx2;
+    char *tmp, *tmp3, *pfx2;
-    hwloc_obj_t loc=NULL, bd=NULL;
+    hwloc_obj_t loc=NULL;
-    char locale[1024], bind[1024];
+    char locale[1024], tmp1[1024], tmp2[1024];
+    hwloc_cpuset_t mycpus;
+    char *str=NULL, *cpu_bitmap=NULL;
+
 
     /* set default result */
     *output = NULL;
@@ -470,10 +473,6 @@ int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_
     }
 
     if (!orte_devel_level_output) {
-        hwloc_cpuset_t mycpus;
-        char tmp1[1024], tmp2[1024];
-        char *str=NULL, *cpu_bitmap=NULL;
-
         if (orte_get_attribute(&src->attributes, ORTE_PROC_CPU_BITMAP, (void**)&cpu_bitmap, OPAL_STRING) &&
             NULL != src->node->topology && NULL != src->node->topology->topo) {
             mycpus = hwloc_bitmap_alloc();
@@ -509,10 +508,10 @@ int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_
 
     asprintf(&tmp, "\n%sData for proc: %s", pfx2, ORTE_NAME_PRINT(&src->name));
 
-    asprintf(&tmp2, "%s\n%s\tPid: %ld\tLocal rank: %lu\tNode rank: %lu\tApp rank: %d", tmp, pfx2,
+    asprintf(&tmp3, "%s\n%s\tPid: %ld\tLocal rank: %lu\tNode rank: %lu\tApp rank: %d", tmp, pfx2,
              (long)src->pid, (unsigned long)src->local_rank, (unsigned long)src->node_rank, src->app_rank);
     free(tmp);
-    tmp = tmp2;
+    tmp = tmp3;
 
     if (orte_get_attribute(&src->attributes, ORTE_PROC_HWLOC_LOCALE, (void**)&loc, OPAL_PTR)) {
         if (NULL != loc) {
@@ -525,23 +524,26 @@ int orte_dt_print_proc(char **output, char *prefix, orte_proc_t *src, opal_data_
     } else {
         strcpy(locale, "UNKNOWN");
     }
-    if (orte_get_attribute(&src->attributes, ORTE_PROC_HWLOC_BOUND, (void**)&bd, OPAL_PTR)) {
+    if (orte_get_attribute(&src->attributes, ORTE_PROC_CPU_BITMAP, (void**)&cpu_bitmap, OPAL_STRING) &&
-        if (NULL != bd) {
+        NULL != src->node->topology && NULL != src->node->topology->topo) {
-            if (OPAL_ERR_NOT_BOUND == opal_hwloc_base_cset2mapstr(bind, sizeof(bind), src->node->topology->topo, bd->cpuset)) {
+        mycpus = hwloc_bitmap_alloc();
-                strcpy(bind, "UNBOUND");
+        hwloc_bitmap_list_sscanf(mycpus, cpu_bitmap);
-            }
+        opal_hwloc_base_cset2mapstr(tmp2, sizeof(tmp2), src->node->topology->topo, mycpus);
     } else {
-            strcpy(bind, "UNBOUND");
+        snprintf(tmp2, sizeof(tmp2), "UNBOUND");
     }
-    } else {
+    asprintf(&tmp3, "%s\n%s\tState: %s\tApp_context: %ld\n%s\tLocale:  %s\n%s\tBinding: %s", tmp, pfx2,
-        strcpy(bind, "UNBOUND");
+             orte_proc_state_to_str(src->state), (long)src->app_idx, pfx2, locale, pfx2,  tmp2);
-    }
-    asprintf(&tmp2, "%s\n%s\tState: %s\tApp_context: %ld\n%s\tLocale:  %s\n%s\tBinding: %s", tmp, pfx2,
-             orte_proc_state_to_str(src->state), (long)src->app_idx, pfx2, locale, pfx2, bind);
     free(tmp);
+    if (NULL != str) {
+        free(str);
+    }
+    if (NULL != cpu_bitmap) {
+        free(cpu_bitmap);
+    }
 
     /* set the return */
-    *output = tmp2;
+    *output = tmp3;
 
     free(pfx2);
     return ORTE_SUCCESS;