From 9ab20cafe33a1e11f6dd2d29bbbad5b8e263f456 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 25 Jul 2016 15:40:32 -0700 Subject: [PATCH] Pass the nodeid for each proc in the job. Fix a mistaken error output message --- .../topo/treematch/topo_treematch_dist_graph_create.c | 2 +- orte/orted/pmix/pmix_server_register_fns.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c index ef0fc4de2e..1d6457cdce 100644 --- a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c +++ b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c @@ -198,7 +198,7 @@ int mca_topo_treematch_dist_graph_create(mca_topo_base_module_t* topo_module, OPAL_MODEX_RECV_VALUE(err, OPAL_PMIX_NODEID, &(proc->super.proc_name), &pval, OPAL_UINT32); if( OPAL_SUCCESS != err ) { opal_output(0, "Unable to extract peer %s nodeid from the modex.\n", - OMPI_NAME_PRINT(&(proc->super))); + OMPI_NAME_PRINT(&(proc->super.proc_name))); vpids[i] = colors[i] = -1; continue; } diff --git a/orte/orted/pmix/pmix_server_register_fns.c b/orte/orted/pmix/pmix_server_register_fns.c index 849208d2e5..cdf770da88 100644 --- a/orte/orted/pmix/pmix_server_register_fns.c +++ b/orte/orted/pmix/pmix_server_register_fns.c @@ -374,12 +374,19 @@ int orte_pmix_server_register_nspace(orte_job_t *jdata) kv->data.uint32 = pptr->node_rank; opal_list_append(pmap, &kv->super); - /* node id */ + /* hostname */ kv = OBJ_NEW(opal_value_t); kv->key = strdup(OPAL_PMIX_HOSTNAME); kv->type = OPAL_STRING; kv->data.string = strdup(pptr->node->name); opal_list_append(pmap, &kv->super); + + /* node ID */ + kv = OBJ_NEW(opal_value_t); + kv->key = strdup(OPAL_PMIX_NODEID); + kv->type = OPAL_UINT32; + kv->data.uint32 = node->index; + opal_list_append(pmap, &kv->super); } /* mark the job as registered */