1
1

orte-rmaps-base: update out-of-slots show_help message

Update the show_help message for when there are not enough slots to
run an application.

Also, remove a bunch of copies of this message in various show_help
text files that aren't used/referred to anywhere in the code.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 430c659908)
Этот коммит содержится в:
Jeff Squyres 2018-11-08 11:50:47 -05:00
родитель 9275b692b7
Коммит 76d4c1843e
5 изменённых файлов: 32 добавлений и 42 удалений

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

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
@ -23,12 +23,35 @@
# This is the US/English general help file for Open RTE's orterun.
#
[orte-rmaps-base:alloc-error]
There are not enough slots available in the system to satisfy the %d slots
that were requested by the application:
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.
Either request fewer slots for your application, or make more slots
available for use.
A "slot" is the Open MPI term for an allocatable unit where we can
launch a process. The number of slots available are defined by the
environment in which Open MPI processes are run:
1. Hostfile, via "slots=N" clauses (N defaults to number of
processor cores if not provided)
2. The --host:N command line parameter (N defaults to 1 if not
provided)
3. Resource manager (e.g., SLURM, PBS/Torque, LSF, etc.)
4. If neither a hostfile, the --hosts command line parameter, nor an
RM is present, Open MPI defaults to the number of processor
cores
In all the above cases, if you want Open MPI to default to the number
of hardware threads instead of the number of processor cores, use the
--use-hwthread-cpus option.
Alternatively, you can use the --oversubscribe option to ignore the
number of available slots when deciding the number of processes to
launch.
#
[orte-rmaps-base:not-all-mapped-alloc]
Some of the requested hosts are not included in the current allocation for the
application:

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

@ -1,6 +1,6 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2013 Los Alamos National Security, LLC.
# All rights reserved.
# $COPYRIGHT$
@ -90,14 +90,6 @@ some systems may require using full hostnames, such as
[bad-index]
Rankfile claimed host %s by index that is bigger than number of allocated hosts.
#
[orte-rmaps-rf: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.
#
[bad-rankfile]
Error, invalid rank (%d) in the rankfile (%s)
#

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

@ -11,6 +11,7 @@
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -19,15 +20,6 @@
#
# This is the US/English general help file for Open RTE's orterun.
#
[orte-rmaps-rr:alloc-error]
There are not enough slots available in the system to satisfy the %d slots
that were requested:
application: %s
host: %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.

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

@ -10,6 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -18,19 +19,8 @@
#
# This is the US/English general help file for Open RTE's orterun.
#
[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. If oversubscription is intended, add
--oversubscribe to the command line.
#
[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.

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

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
@ -22,13 +22,6 @@
#
# This is the US/English general help file for Open RTE's orterun.
#
[orte-rtc-base: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-rtc-base:not-all-mapped-alloc]
Some of the requested hosts are not included in the current allocation for the
application: