From 8d4592a94baaa27b73ec22c73bb77dd988fff0f0 Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Fri, 21 Feb 2014 11:38:35 +0000 Subject: [PATCH] rmaps/mindist: better error message better error message when there is only one socket available fixed by Elena, reviewed by Miked cmr=v1.7.5:reviewer=ompi-rm1.7 This commit was SVN r30787. --- orte/mca/rmaps/mindist/rmaps_mindist_module.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/orte/mca/rmaps/mindist/rmaps_mindist_module.c b/orte/mca/rmaps/mindist/rmaps_mindist_module.c index 3778e6454f..518b1bbd91 100644 --- a/orte/mca/rmaps/mindist/rmaps_mindist_module.c +++ b/orte/mca/rmaps/mindist/rmaps_mindist_module.c @@ -281,9 +281,12 @@ static int mindist_map(orte_job_t *jdata) "mca:rmaps:mindist: assigned %d procs to node %s", j, node->name); } else { - /* don't have info about pci locality */ - orte_show_help("help-orte-rmaps-md.txt", "orte-rmaps-mindist:no-pci-locality-info", - true, node->name); + if (hwloc_get_nbobjs_by_type(node->topology, HWLOC_OBJ_SOCKET) > 1) { + /* don't have info about pci locality */ + orte_show_help("help-orte-rmaps-md.txt", "orte-rmaps-mindist:no-pci-locality-info", + true, node->name); + } + /* else silently switch to byslot mapper since distance info is irrelevant for this machine configuration */ ORTE_SET_MAPPING_POLICY(jdata->map->mapping, ORTE_MAPPING_BYSLOT); rc = ORTE_ERR_TAKE_NEXT_OPTION; goto error;