Add some missing localities to the hwloc pretty-print, fix pmi modex
This commit was SVN r26105.
Этот коммит содержится в:
родитель
a78a7bd8e8
Коммит
366f9d1518
@ -1449,6 +1449,17 @@ char* opal_hwloc_base_print_locality(opal_paffinity_locality_t locality)
|
||||
}
|
||||
if (0 < idx) {
|
||||
ptr->buffers[ptr->cntr][idx-1] = '\0';
|
||||
} else if (OPAL_PROC_NON_LOCAL & locality) {
|
||||
ptr->buffers[ptr->cntr][idx++] = 'N';
|
||||
ptr->buffers[ptr->cntr][idx++] = 'O';
|
||||
ptr->buffers[ptr->cntr][idx++] = 'N';
|
||||
ptr->buffers[ptr->cntr][idx++] = '\0';
|
||||
} else {
|
||||
/* must be an unknown locality */
|
||||
ptr->buffers[ptr->cntr][idx++] = 'U';
|
||||
ptr->buffers[ptr->cntr][idx++] = 'N';
|
||||
ptr->buffers[ptr->cntr][idx++] = 'K';
|
||||
ptr->buffers[ptr->cntr][idx++] = '\0';
|
||||
}
|
||||
return ptr->buffers[ptr->cntr];
|
||||
}
|
||||
|
@ -471,7 +471,7 @@ static int modex(opal_list_t *procs)
|
||||
orte_process_info.num_nodes++;
|
||||
}
|
||||
/* see if this proc is already in the pidmap */
|
||||
if (NULL == opal_pointer_array_get_item(&jmap->pmap, v)) {
|
||||
if (NULL == (pmap = opal_pointer_array_get_item(&jmap->pmap, v))) {
|
||||
/* nope - add it */
|
||||
pmap = OBJ_NEW(orte_pmap_t);
|
||||
pmap->node = loc->index;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user