1
1
This commit was SVN r32494.
Этот коммит содержится в:
Gilles Gouaillardet 2014-08-11 03:22:05 +00:00
родитель d9e0212e0e
Коммит c3c364a262
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -855,7 +857,7 @@ int orte_rmaps_base_set_ranking_policy(orte_ranking_policy_t *policy,
ORTE_SET_RANKING_DIRECTIVE(tmp, ORTE_RANKING_FILL); ORTE_SET_RANKING_DIRECTIVE(tmp, ORTE_RANKING_FILL);
} else { } else {
/* unrecognized modifier */ /* unrecognized modifier */
orte_show_help("help-orte-rmaps-base.txt", "unrecognized-modifier", true, "ranking", ck[1]); orte_show_help("help-orte-rmaps-base.txt", "unrecognized-modifier", true, ck[1]);
opal_argv_free(ck); opal_argv_free(ck);
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }

Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -149,7 +151,7 @@ static int mindist_map(orte_job_t *jdata)
* all available slots. We'll double-check the single app_context rule first * all available slots. We'll double-check the single app_context rule first
*/ */
if (0 == app->num_procs && 1 < jdata->num_apps) { if (0 == app->num_procs && 1 < jdata->num_apps) {
orte_show_help("help-orte-rmaps-mindist.txt", "multi-apps-and-zero-np", orte_show_help("help-orte-rmaps-md.txt", "multi-apps-and-zero-np",
true, jdata->num_apps, NULL); true, jdata->num_apps, NULL);
rc = ORTE_ERR_SILENT; rc = ORTE_ERR_SILENT;
goto error; goto error;