From 07f0a71faabce9e742b5ed4bb520d15b82d5e310 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 17 Apr 2008 14:43:15 +0000 Subject: [PATCH] Cleanup the show_help entries on the seq mapper This commit was SVN r18191. --- orte/mca/rmaps/seq/help-orte-rmaps-seq.txt | 33 +++++----------------- orte/mca/rmaps/seq/rmaps_seq.c | 2 +- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/orte/mca/rmaps/seq/help-orte-rmaps-seq.txt b/orte/mca/rmaps/seq/help-orte-rmaps-seq.txt index 2b7941d88a..6661604737 100644 --- a/orte/mca/rmaps/seq/help-orte-rmaps-seq.txt +++ b/orte/mca/rmaps/seq/help-orte-rmaps-seq.txt @@ -18,36 +18,17 @@ # # This is the US/English general help file for Open RTE's orterun. # -[orte-rmaps-rr:alloc-error] +[orte-rmaps-seq:alloc-error] There are not enough slots available in the system to satisfy the %d slots that were requested by the application: %s Either request fewer slots for your application, or make more slots available for use. -[orte-rmaps-rr:multi-apps-and-zero-np] -RMAPS found multiple applications to be launched, with -at least one that failed to specify the number of processes to execute. -When specifying multiple applications, you must specify how many processes -of each to launch via the -np argument. +# +[orte-rmaps-seq:resource-not-found] +The specified hostfile contained a node (%s) that is not in your +allocation. We therefore cannot map a process rank to it. Please +check your allocation and hostfile to ensure the hostfile only +contains allocated nodes. -[orte-rmaps-rr:per-node-and-too-many-procs] -There are not enough nodes in your allocation to satisfy your request to launch -%d processes on a per-node basis - only %d nodes were available. - -Either request fewer processes, or obtain a larger allocation. -[orte-rmaps-rr:n-per-node-and-too-many-procs] -There are not enough nodes in your allocation to satisfy your request to launch -%d processes on a %d per-node basis - only %d nodes with a total of %d slots were available. - -Either request fewer processes, or obtain a larger allocation. -[orte-rmaps-rr:n-per-node-and-not-enough-slots] -There are not enough slots on the nodes in your allocation to satisfy your request to launch on a %d process-per-node basis - only %d slots/node were available. - -Either request fewer processes/node, or obtain a larger allocation. - -[orte-rmaps-rr:no-np-and-user-map] -You have specified a rank-to-node/slot mapping, but failed to provide -the number of processes to be executed. For some reason, this information -could not be obtained from the mapping you provided, so we cannot continue -with executing the specified application. diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c index e701be748b..0c144bb585 100644 --- a/orte/mca/rmaps/seq/rmaps_seq.c +++ b/orte/mca/rmaps/seq/rmaps_seq.c @@ -184,7 +184,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata) /* wasn't found - that is an error */ opal_show_help("help-orte-rmaps-seq.txt", "orte-rmaps-seq:resource-not-found", - true); + true, nd->name); rc = ORTE_ERR_SILENT; goto error; }