From 7abf30945c21d1dce8f0edcaedbc911c5ca6f28b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 27 Sep 2023 07:41:36 -0600 Subject: [PATCH] Correct confusion over help file names Got renamed to "help-schizo-xxx", but still referenced by "help-xxx" in some places, so let's revert back to the original "help-xxx" syntax as the tools being referenced have nothing to do with the schizo framework. Signed-off-by: Ralph Castain (cherry picked from commit 15fe0b5dc90a4aed5635b9daeda3e0b4031a9277) --- docs/news/news-v3.x.rst | 1 + src/docs/show-help-files/Makefile.am | 24 +- ...lp-schizo-pinfo.rst => help-prte-info.rst} | 0 .../{help-schizo-prte.rst => help-prte.rst} | 0 .../{help-schizo-prted.rst => help-prted.rst} | 0 ...lp-schizo-prterun.rst => help-prterun.rst} | 0 .../{help-schizo-prun.rst => help-prun.rst} | 0 .../{help-schizo-pterm.rst => help-pterm.rst} | 0 src/docs/show-help-files/index.rst | 12 +- src/mca/schizo/prte/schizo_prte.c | 12 +- src/tools/prte_info/Makefile.am | 2 - src/tools/prte_info/help-prte-info.txt | 99 --- src/tools/prun/Makefile.am | 4 +- src/tools/prun/help-prun.txt | 728 ------------------ src/tools/pterm/Makefile.am | 4 +- src/tools/pterm/help-pterm.txt | 34 - 16 files changed, 27 insertions(+), 893 deletions(-) rename src/docs/show-help-files/{help-schizo-pinfo.rst => help-prte-info.rst} (100%) rename src/docs/show-help-files/{help-schizo-prte.rst => help-prte.rst} (100%) rename src/docs/show-help-files/{help-schizo-prted.rst => help-prted.rst} (100%) rename src/docs/show-help-files/{help-schizo-prterun.rst => help-prterun.rst} (100%) rename src/docs/show-help-files/{help-schizo-prun.rst => help-prun.rst} (100%) rename src/docs/show-help-files/{help-schizo-pterm.rst => help-pterm.rst} (100%) delete mode 100644 src/tools/prte_info/help-prte-info.txt delete mode 100644 src/tools/prun/help-prun.txt delete mode 100644 src/tools/pterm/help-pterm.txt diff --git a/docs/news/news-v3.x.rst b/docs/news/news-v3.x.rst index dbe604445b..80cb314fc4 100644 --- a/docs/news/news-v3.x.rst +++ b/docs/news/news-v3.x.rst @@ -14,6 +14,7 @@ series, in reverse chronological order. continue to improve and correct the documents in future releases. +- PR #1816: Correct confusion over help file names - PR #1814: Update NEWS infrastructure - PR #1810: Blacklist the HWLOC GL component to avoid deadlock - PR #1807: Multiple commits diff --git a/src/docs/show-help-files/Makefile.am b/src/docs/show-help-files/Makefile.am index 6d10e65c38..c3d22876f7 100644 --- a/src/docs/show-help-files/Makefile.am +++ b/src/docs/show-help-files/Makefile.am @@ -36,12 +36,12 @@ SPHINX_OPTS ?= --keep-going -j auto RST_SOURCE_FILES = \ $(srcdir)/prrte-rst-content/*.rst \ $(srcdir)/index.rst \ - $(srcdir)/help-schizo-pinfo.rst \ - $(srcdir)/help-schizo-prte.rst \ - $(srcdir)/help-schizo-prted.rst \ - $(srcdir)/help-schizo-prterun.rst \ - $(srcdir)/help-schizo-prun.rst \ - $(srcdir)/help-schizo-pterm.rst + $(srcdir)/help-prte-info.rst \ + $(srcdir)/help-prte.rst \ + $(srcdir)/help-prted.rst \ + $(srcdir)/help-prterun.rst \ + $(srcdir)/help-prun.rst \ + $(srcdir)/help-pterm.rst TXT_OUTDIR = $(OUTDIR)/text @@ -49,12 +49,12 @@ TXT_OUTDIR = $(OUTDIR)/text # will emit lots of files in the TXT_OUTDIR; these are the only ones # that we care about). ALL_TXT_BUILT = \ - $(TXT_OUTDIR)/help-schizo-pinfo.txt \ - $(TXT_OUTDIR)/help-schizo-prte.txt \ - $(TXT_OUTDIR)/help-schizo-prted.txt \ - $(TXT_OUTDIR)/help-schizo-prterun.txt \ - $(TXT_OUTDIR)/help-schizo-prun.txt \ - $(TXT_OUTDIR)/help-schizo-pterm.txt + $(TXT_OUTDIR)/help-prte-info.txt \ + $(TXT_OUTDIR)/help-prte.txt \ + $(TXT_OUTDIR)/help-prted.txt \ + $(TXT_OUTDIR)/help-prterun.txt \ + $(TXT_OUTDIR)/help-prun.txt \ + $(TXT_OUTDIR)/help-pterm.txt #------------------- diff --git a/src/docs/show-help-files/help-schizo-pinfo.rst b/src/docs/show-help-files/help-prte-info.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-pinfo.rst rename to src/docs/show-help-files/help-prte-info.rst diff --git a/src/docs/show-help-files/help-schizo-prte.rst b/src/docs/show-help-files/help-prte.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-prte.rst rename to src/docs/show-help-files/help-prte.rst diff --git a/src/docs/show-help-files/help-schizo-prted.rst b/src/docs/show-help-files/help-prted.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-prted.rst rename to src/docs/show-help-files/help-prted.rst diff --git a/src/docs/show-help-files/help-schizo-prterun.rst b/src/docs/show-help-files/help-prterun.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-prterun.rst rename to src/docs/show-help-files/help-prterun.rst diff --git a/src/docs/show-help-files/help-schizo-prun.rst b/src/docs/show-help-files/help-prun.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-prun.rst rename to src/docs/show-help-files/help-prun.rst diff --git a/src/docs/show-help-files/help-schizo-pterm.rst b/src/docs/show-help-files/help-pterm.rst similarity index 100% rename from src/docs/show-help-files/help-schizo-pterm.rst rename to src/docs/show-help-files/help-pterm.rst diff --git a/src/docs/show-help-files/index.rst b/src/docs/show-help-files/index.rst index 7ca1357713..64c50dad38 100644 --- a/src/docs/show-help-files/index.rst +++ b/src/docs/show-help-files/index.rst @@ -9,17 +9,17 @@ harmelss by-products; we ignore them. .. toctree:: - Pinfo + Pinfo - Prte + Prte - Prted + Prted - Prterun + Prterun - Prun + Prun - Prun + Prun Have to also include these additional files so that Sphinx doesn't complain that there are RST files in the doc tree that aren't used. diff --git a/src/mca/schizo/prte/schizo_prte.c b/src/mca/schizo/prte/schizo_prte.c index a45b7c790c..3e1b56dda2 100644 --- a/src/mca/schizo/prte/schizo_prte.c +++ b/src/mca/schizo/prte/schizo_prte.c @@ -462,27 +462,27 @@ static int parse_cli(char **argv, pmix_cli_result_t *results, if (0 == strcmp(prte_tool_actual, "prte")) { myoptions = prteoptions; shorts = prteshorts; - helpfile = "help-schizo-prte.txt"; + helpfile = "help-prte.txt"; } else if (0 == strcmp(prte_tool_actual, "prterun")) { myoptions = prterunoptions; shorts = prterunshorts; - helpfile = "help-schizo-prterun.txt"; + helpfile = "help-prterun.txt"; } else if (0 == strcmp(prte_tool_actual, "prted")) { myoptions = prtedoptions; shorts = prtedshorts; - helpfile = "help-schizo-prted.txt"; + helpfile = "help-prted.txt"; } else if (0 == strcmp(prte_tool_actual, "prun")) { myoptions = prunoptions; shorts = prunshorts; - helpfile = "help-schizo-prun.txt"; + helpfile = "help-prun.txt"; } else if (0 == strcmp(prte_tool_actual, "pterm")) { myoptions = ptermoptions; shorts = ptermshorts; - helpfile = "help-schizo-pterm.txt"; + helpfile = "help-pterm.txt"; } else if (0 == strcmp(prte_tool_actual, "prte_info")) { myoptions = pinfooptions; shorts = pinfoshorts; - helpfile = "help-schizo-pinfo.txt"; + helpfile = "help-prte-info.txt"; } pmix_tool_msg = "Report bugs to: https://github.com/openpmix/prrte"; pmix_tool_org = "PRRTE"; diff --git a/src/tools/prte_info/Makefile.am b/src/tools/prte_info/Makefile.am index 621fd8245b..62ac24b0c7 100644 --- a/src/tools/prte_info/Makefile.am +++ b/src/tools/prte_info/Makefile.am @@ -42,8 +42,6 @@ AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS) bin_PROGRAMS = prte_info -dist_prtedata_DATA = help-prte-info.txt - prte_info_SOURCES = \ pinfo.h \ prte_info.c \ diff --git a/src/tools/prte_info/help-prte-info.txt b/src/tools/prte_info/help-prte-info.txt deleted file mode 100644 index 57aabae424..0000000000 --- a/src/tools/prte_info/help-prte-info.txt +++ /dev/null @@ -1,99 +0,0 @@ -# -*- text -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2010-2020 Cisco Systems, Inc. All rights reserved -# Copyright (c) 2016-2020 Intel, Inc. All rights reserved. -# Copyright (c) 2022 Nanook Consulting. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# This is the US/English help file for PRTE pinfo error -# messages. -# -[help] -The prte_info command can be used to provide detailed information on -your PRTE installation. Syntax: - -%s -# -[version] -Output PRRTE version -# -[verbose] -Set typical debugging verbosity options, with level -determined by number of times this option is given -(e.g., -vvv equates to debugging level of 3) -# -[parseable] -Output information (e.g., help messages) in machine-parseable -friendly format -# -[parsable] -Output information (e.g., help messages) in machine-parseable -friendly format -# -[param] -Show MCA parameters. The first parameter is the framework (or the keyword "all"); -the second parameter is the specific component name (or the keyword "all"). -# -[internal] -Show internal MCA parameters (not meant to be modified by users) -# -[path] -Show paths that PRRTE was configured with. Accepts the following parameters: - prefix, bindir, libdir, incdir, mandir, pkglibdir, sysconfdir -# -[arch] -Show architecture PRRTE was compiled on -# -[config] -Show configuration options -# -[hostname] -Show the hostname that PRTE was configured and built on -# -[all] -Show all configuration options and MCA parameters -# -[lib-call-fail] -A library call unexpectedly failed. This is a terminal error; please -show this message to a PRTE wizard: - - Library call: %s - Source file: %s - Source line number: %d - -Aborting... -# -[developer warning: field too long] -************************************************************************** -*** DEVELOPER WARNING: A field in prte_info output is too long and -*** will appear poorly in the prettyprint output. -*** -*** Value: "%s" -*** Max length: %d -************************************************************************** -# -[not-found] -The specified framework could not be found: - - Framework: %s - -This could be due to a misspelling of the framework name, or because support -for that framework was not configured into this version of PRTE. Please see - - prte_info --config - -for a full report of how PRTE was configured. diff --git a/src/tools/prun/Makefile.am b/src/tools/prun/Makefile.am index ca181e3770..4db4e2480e 100644 --- a/src/tools/prun/Makefile.am +++ b/src/tools/prun/Makefile.am @@ -14,7 +14,7 @@ # Copyright (c) 2015-2020 Intel, Inc. All rights reserved. # Copyright (c) 2019 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. +# Copyright (c) 2021-2023 Nanook Consulting. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -41,8 +41,6 @@ AM_CFLAGS = \ bin_PROGRAMS = prun -dist_prtedata_DATA = help-prun.txt - prun_SOURCES = \ main.c \ prun.c \ diff --git a/src/tools/prun/help-prun.txt b/src/tools/prun/help-prun.txt deleted file mode 100644 index 673305a86c..0000000000 --- a/src/tools/prun/help-prun.txt +++ /dev/null @@ -1,728 +0,0 @@ -# -*- text -*- -# -# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2007-2020 Cisco Systems, Inc. All rights reserved -# Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. -# Copyright (c) 2017-2020 Intel, Inc. All rights reserved. -# Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# This is the US/English general help file for PRTE's prun. -# -[prun:init-failure] -The PMIx Reference RTE was unable to initialize properly. The error occured while -attempting to %s. Returned value %d instead of PRTE_SUCCESS. -[prun:usage] -%s (%s) %s - -Usage: %s [ options ] [ ] -Submit job to the PMIx Reference RTE - -%s - -Report bugs to %s -[prun:version] -%s (%s) %s - -Report bugs to %s -[prun:allocate-resources] -%s was unable to allocate enough resources to start your application. -This might be a transient error (too many nodes in the cluster were -unavailable at the time of the request) or a permenant error (you -requsted more nodes than exist in your cluster). - -While probably only useful to PRTE developers, the error returned -was %d. -[prun:error-spawning] -%s was unable to start the specified application. An attempt has been -made to clean up all processes that did start. The error returned was -%d. -[prun:appfile-not-found] -Unable to open the appfile: - - %s - -Double check that this file exists and is readable. -[prun:executable-not-specified] -No executable was specified on the %s command line. - -Aborting. -[prun:multi-apps-and-zero-np] -%s found multiple applications specified on the command line, 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. -[prun:nothing-to-do] -%s could not find anything to do. - -It is possible that you forgot to specify how many processes to run -via the "-np" argument. -[prun:call-failed] -%s encountered a %s call failure. This should not happen, and -usually indicates an error within the operating system itself. -Specifically, the following error occurred: - - %s - -The only other available information that may be helpful is the errno -that was returned: %d. -[prun:environ] -%s was unable to set - %s = %s -in the environment. Returned value %d instead of PRTE_SUCCESS. -[prun:precondition] -%s was unable to precondition transports -Returned value %d instead of PRTE_SUCCESS. -[prun:attr-failed] -%s was unable to define an attribute -Returned value %d instead of PRTE_SUCCESS. -# -[prun:proc-ordered-abort] -%s has exited due to process rank %lu with PID %lu on -node %s calling "abort". This may have caused other processes -in the application to be terminated by signals sent by %s -(as reported here). -# -[prun:proc-exit-no-sync] -%s has exited due to process rank %lu with PID %lu on -node %s exiting improperly. There are three reasons this could occur: - -1. this process did not call "init" before exiting, but others in -the job did. This can cause a job to hang indefinitely while it waits -for all processes to call "init". By rule, if one process calls "init", -then ALL processes must call "init" prior to termination. - -2. this process called "init", but exited without calling "finalize". -By rule, all processes that call "init" MUST call "finalize" prior to -exiting or it will be considered an "abnormal termination" - -3. this process called "MPI_Abort" or "prte_abort" and the mca parameter -prte_create_session_dirs is set to false. In this case, the run-time cannot -detect that the abort call was an abnormal termination. Hence, the only -error message you will receive is this one. - -This may have caused other processes in the application to be -terminated by signals sent by %s (as reported here). - -You can avoid this message by specifying -quiet on the %s command line. -# -[prun:proc-exit-no-sync-unknown] -%s has exited due to a process exiting without calling "finalize", -but has no info as to the process that caused that situation. This -may have caused other processes in the application to be -terminated by signals sent by %s (as reported here). -# -[prun:proc-aborted] -%s noticed that process rank %lu with PID %lu on node %s exited on signal %d. -# -[prun:proc-aborted-unknown] -%s noticed that the job aborted, but has no info as to the process -that caused that situation. -# -[prun:proc-aborted-signal-unknown] -%s noticed that the job aborted by signal, but has no info as -to the process that caused that situation. -# -[prun:proc-aborted-strsignal] -%s noticed that process rank %lu with PID %lu on node %s exited on signal %d (%s). -# -[prun:abnormal-exit] -WARNING: %s has exited before it received notification that all -started processes had terminated. You should double check and ensure -that there are no runaway processes still executing. -# -[prun:sigint-while-processing] -WARNING: %s is in the process of killing a job, but has detected an -interruption (probably control-C). - -It is dangerous to interrupt %s while it is killing a job (proper -termination may not be guaranteed). Hit control-C again within 1 -second if you really want to kill %s immediately. -# -[prun:double-prefix] -Both a prefix was supplied to %s and the absolute path to %s was -given: - - Prefix: %s - Path: %s - -Only one should be specified to avoid potential version -confusion. Operation will continue, but the -prefix option will be -used. This is done to allow you to select a different prefix for -the backend computation nodes than used on the frontend for %s. -# -[prun:app-prefix-conflict] -Both a prefix or absolute path was given for %s, and a different -prefix provided for the first app_context: - - Mpirun prefix: %s - App prefix: %s - -Only one should be specified to avoid potential version -confusion. Operation will continue, but the application's prefix -option will be ignored. -# -[prun:empty-prefix] -A prefix was supplied to %s that only contained slashes. - -This is a fatal error; %s will now abort. No processes were launched. -# -[debugger-mca-param-not-found] -Internal error -- the prte_base_user_debugger MCA parameter was not able to -be found. Please contact the PRTE developers; this should not -happen. -# -[prun:sys-limit-pipe] -%s was unable to launch the specified application as it encountered an error: - -Error: system limit exceeded on number of pipes that can be open -Node: %s - -when attempting to start process rank %lu. - -This can be resolved by setting the mca parameter opal_set_max_sys_limits to 1, -increasing your limit descriptor setting (using limit or ulimit commands), -asking the system administrator for that node to increase the system limit, or -by rearranging your processes to place fewer of them on that node. -# -[prun:sys-limit-files] -%s was unable to launch the specified application as it encountered an error: - -Error: system limit exceeded on number of files that can be open -Node: %s - -when attempting to start process rank %lu. - -This can be resolved by setting the mca parameter opal_set_max_sys_limits to 1, -increasing your limit descriptor setting (using limit or ulimit commands), -asking the system administrator for that node to increase the system limit, or -by rearranging your processes to place fewer of them on that node. -# -[prun:sys-limit-sockets] -Error: system limit exceeded on number of network connections that can be open - -This can be resolved by setting the mca parameter opal_set_max_sys_limits to 1, -increasing your limit descriptor setting (using limit or ulimit commands), -or asking the system administrator to increase the system limit. -# -[prun:pipe-setup-failure] -%s was unable to launch the specified application as it encountered an error: - -Error: pipe function call failed when setting up I/O forwarding subsystem -Node: %s - -while attempting to start process rank %lu. -# -[prun:sys-limit-children] -%s was unable to launch the specified application as it encountered an error: - -Error: system limit exceeded on number of processes that can be started -Node: %s - -when attempting to start process rank %lu. - -This can be resolved by either asking the system administrator for that node to -increase the system limit, or by rearranging your processes to place fewer of them -on that node. -# -[prun:failed-term-attrs] -%s was unable to launch the specified application as it encountered an error: - -Error: reading tty attributes function call failed while setting up -I/O forwarding system -Node: %s - -while attempting to start process rank %lu. -# -[prun:wdir-not-found] -%s was unable to launch the specified application as it could not -find the specified working directory: - -Working directory: %s -Node: %s - -while attempting to start process rank %lu. -# -[prun:wdir-not-accessible] -%s was unable to launch the specified application as it lacks -permissions to change to the specified working directory: - -Working directory: %s -Node: %s - -while attempting to start process rank %lu. -# -[prun:exe-not-found] -%s was unable to find the specified executable file, and therefore -did not launch the job. This error was first reported for process -rank %lu; it may have occurred for other processes as well. - -NOTE: A common cause for this error is misspelling a %s command - line parameter option (remember that %s interprets the first - unrecognized command line token as the executable). - -Node: %s -Executable: %s -# -[prun:exe-not-accessible] -%s was unable to launch the specified application as it lacked -permissions to execute an executable: - -Executable: %s -Node: %s - -while attempting to start process rank %lu. -# -[prun:pipe-read-failure] -%s was unable to launch the specified application as it encountered an error: - -Error: reading from a pipe function call failed while spawning a local process -Node: %s - -while attempting to start process rank %lu. -# -[prun:proc-failed-to-start] -%s was unable to start the specified application as it encountered an -error: - -Error code: %d -Error name: %s -Node: %s - -when attempting to start process rank %lu. -# -[prun:proc-socket-not-avail] -%s was unable to start the specified application as it encountered an -error: - -Error name: %s -Node: %s - -when attempting to start process rank %lu. -# -[prun:proc-failed-to-start-no-status] -%s was unable to start the specified application as it encountered an -error on node %s. More information may be available above. -# -[prun:proc-failed-to-start-no-status-no-node] -%s was unable to start the specified application as it encountered an -error. More information may be available above. -# -[prun:daemon-died-during-execution] -%s has detected that a required daemon terminated during execution -of the application with a non-zero status. This is a fatal error. -A best-effort attempt has been made to cleanup. However, it is --strongly- recommended that you execute the prte-clean utility -to ensure full cleanup is accomplished. -# -[prun:no-orted-object-exit] -%s was unable to determine the status of the daemons used to -launch this application. Additional manual cleanup may be required. -Please refer to the "prte-clean" tool for assistance. -# -[prun:unclean-exit] -%s was unable to cleanly terminate the daemons on the nodes shown -below. Additional manual cleanup may be required - please refer to -the "prte-clean" tool for assistance. -# -[prun:event-def-failed] -%s was unable to define an event required for proper operation of -the system. The reason for this error was: - -Error: %s - -Please report this to the PRTE mailing list users@open-mpi.org. -# -[prun:ompi-server-filename-bad] -%s was unable to parse the filename where contact info for the -ompi-server was to be found. The option we were given was: - ---ompi-server %s - -This appears to be missing the required ':' following the -keyword "file". Please remember that the correct format for this -command line option is: - ---ompi-server file:path-to-file - -where path-to-file can be either relative to the cwd or absolute. -# -[prun:ompi-server-filename-missing] -%s was unable to parse the filename where contact info for the -ompi-server was to be found. The option we were given was: - ---ompi-server %s - -This appears to be missing a filename following the ':'. Please -remember that the correct format for this command line option is: - ---ompi-server file:path-to-file - -where path-to-file can be either relative to the cwd or absolute. -# -[prun:ompi-server-filename-access] -%s was unable to access the filename where contact info for the -ompi-server was to be found. The option we were given was: - ---ompi-server %s - -Please remember that the correct format for this command line option is: - ---ompi-server file:path-to-file - -where path-to-file can be either relative to the cwd or absolute, and that -you must have read access permissions to that file. -# -[prun:ompi-server-file-bad] -%s was unable to read the ompi-server's contact info from the -given filename. The filename we were given was: - -FILE: %s - -Please remember that the correct format for this command line option is: - ---ompi-server file:path-to-file - -where path-to-file can be either relative to the cwd or absolute, and that -the file must have a single line in it that contains the PRTE -uri for the ompi-server. Note that this is *not* a standard uri, but -a special format used internally by PRTE for communications. It can -best be generated by simply directing the ompi-server to put its -uri in a file, and then giving %s that filename. -[prun:multiple-hostfiles] -Error: More than one hostfile was passed for a single application -context, which is not supported at this time. -# -[prun:conflicting-params] -%s has detected multiple instances of an MCA param being specified on -the command line, with conflicting values: - -MCA param: %s -Value 1: %s -Value 2: %s - -This MCA param does not support multiple values, and the system is unable -to identify which value was intended. If this was done in error, please -re-issue the command with only one value. You may wish to review the -output from ompi_info for guidance on accepted values for this param. - -[prun:server-not-found] -%s was instructed to wait for the requested ompi-server, but was unable to -establish contact with the server during the specified wait time: - -Server uri: %s -Timeout time: %ld - -Error received: %s - -Please check to ensure that the requested server matches the actual server -information, and that the server is in operation. -# -[prun:server-unavailable] -The user has called an operation involving MPI_Connect and/or MPI_Accept -that spans multiple invocations of mpirun. This requires the support of -the ompi-server tool, which must be executing somewhere that can be -accessed by all participants. - -Please ensure the tool is running, and provide each mpirun with the MCA -parameter "pmix_server_uri" pointing to it. -# -[prun:malformedport] -An operation involving MPI_Connect and/or MPI_Accept was called with -an unrecognized port string. This typically happens when passing the -string on a cmd line and failing to properly quote it to protect -against the special characters it includes -# -[prun:ompi-server-pid-bad] -%s was unable to parse the PID of the %s to be used as the ompi-server. -The option we were given was: - ---ompi-server %s - -Please remember that the correct format for this command line option is: - ---ompi-server PID:pid-of-%s - -where PID can be either "PID" or "pid". -# -[prun:ompi-server-could-not-get-hnp-list] -%s was unable to search the list of local %s contact files to find the -specified pid. You might check to see if your local session directory -is available and that you have read permissions on the top of that -directory tree. -# -[prun:ompi-server-pid-not-found] -%s was unable to find an %s with the specified pid of %d that was to -be used as the ompi-server. The option we were given was: - ---ompi-server %s - -Please remember that the correct format for this command line option is: - ---ompi-server PID:pid-of-%s - -where PID can be either "PID" or "pid". -# -[prun:write_file] -%s was unable to open a file to printout %s as requested. The file -name given was: - -File: %s -# -[prun:multiple-paffinity-schemes] -Multiple processor affinity schemes were specified (can only specify -one): - -Slot list: %s -opal_paffinity_alone: true - -Please specify only the one desired method. -# -[prun:slot-list-failed] -We were unable to successfully process/set the requested processor -affinity settings: - -Specified slot list: %s -Error: %s - -This could mean that a non-existent processor was specified, or -that the specification had improper syntax. -# -[prun:invalid-node-rank] -An invalid node rank was obtained - this is probably something -that should be reported to the OMPI developers. -# -[prun:invalid-local-rank] -An invalid local rank was obtained - this is probably something -that should be reported to the OMPI developers. -# -[prun:invalid-phys-cpu] -An invalid physical processor id was returned when attempting to -set processor affinity - please check to ensure that your system -supports such functionality. If so, then this is probably something -that should be reported to the OMPI developers. -# -[prun:failed-set-paff] -An attempt to set processor affinity has failed - please check to -ensure that your system supports such functionality. If so, then -this is probably something that should be reported to the OMPI -developers. -# -[prun:topo-not-supported] -An attempt was made to bind a process to a specific hardware topology -mapping (e.g., binding to a package) but the operating system does not -support such topology-aware actions. Talk to your local system -administrator to find out if your system can support topology-aware -functionality (e.g., Linux Kernels newer than v2.6.18). - -Systems that do not support processor topology-aware functionality -cannot use "bind to package" and other related functionality. - - Local host: %s - Action attempted: %s %s - Application name: %s -# -[prun:binding-not-avail] -A request to bind the processes if the operating system supports such -an operation was made, but the OS does not support this operation: - - Local host: %s - Action requested: %s - Application name: %s - -Because the request was made on an "if-available" basis, the job was -launched without taking the requested action. If this is not the -desired behavior, talk to your local system administrator to find out -if your system can support the requested action. -# -[prun:not-enough-resources] -Not enough %s were found on the local host to meet the requested -binding action: - - Local host: %s - Action requested: %s - Application name: %s - -Please revise the request and try again. -# -[prun:paffinity-missing-module] -A request to bind processes was made, but no paffinity module -was found: - - Local host: %s - -This is potentially a configuration. You can rerun your job without -requesting binding, or check the configuration. -# -[prun:invalid-slot-list-range] -A slot list was provided that exceeds the boundaries on available -resources: - - Local host: %s - Slot list: %s - -Please check your boundaries and try again. -# -[prun:proc-comm-failed] -A critical communication path was lost to: - - My name: %s - Process name: %s - Node: %s -# -[prun:proc-mem-exceeded] -A process exceeded memory limits: - - Process name: %s - Node: %s -# -[prun:proc-stalled] -One or more processes appear to have stalled - a monitored file -failed to show the required activity. -# -[prun:proc-sensor-exceeded] -One or more processes have exceeded a specified sensor limit, but -no further info is available. -# -[prun:proc-heartbeat-failed] -%s failed to receive scheduled heartbeat communications from a remote -process: - - Process name: %s - Node: %s -# -[prun:non-zero-exit] -%s detected that one or more processes exited with non-zero status, thus causing -the job to be terminated. The first process to do so was: - - Process name: %s - Exit code: %d -# -[prun:unrecognized-mr-type] -%s does not recognize the type of job. This should not happen and -indicates an PRTE internal problem. -# -[multiple-combiners] -More than one combiner was specified. The combiner takes the output -from the final reducer in each chain to produce a single, combined -result. Thus, there can only be one combiner for a job. Please -review your command line and try again. -# -[prun:negative-nprocs] -%s has detected that one or more applications was given a negative -number of processes to run: - - Application: %s - Num procs: %d - -Please correct this value and try again. -# -[prun:timeout] -The user-provided time limit for job execution has been reached: - - Timeout: %d seconds - -The job will now be aborted. Please check your code and/or -adjust/remove the job execution time limit (as specified by --timeout -command line option or MPIEXEC_TIMEOUT environment variable). -# -[prun:conflict-env-set] -ERROR: You have attempted to pass environment variables to PRTE -with both the "-x" method and by setting the MCA parameter "mca_base_env_list". - -PRTE does not support mixing these two methods. Please choose one -method and try launching your job again. - -Your job will now abort. -# -[prun:pmix-failed] -The call to pmix_init_server() failed. This may be due to your -system's restriction for Unix's socket's path-length. - - prte_proc_session_dir: %s - -Please try to set TMPDIR to something short (like /tmp) or change -Your computer's name (see uname -n). -# -[prun:timeoutconflict] -Conflicting requests for timeout were given: - - --timeout command line option: %d - MPIEXEC_TIMEOUT envar: %s - -Only one method should be provided, or else they must agree. Please -correct and retry. -# -[prun:stop-on-exec] -%s was unable to stop the executable at first instruction: - - Error: %s - Nodename: %s - Rank: %lu -# -[use-pterm] -Use of %s to terminate the PRTE DVM has been deprecated. Please use -the "pterm" tool instead in the future. -# -[bad-pause-for-tool] -%s detected the presence of the PMIX_LAUNCHER_PAUSE_FOR_TOOL environmental -variable, but the value of the variable is in an improper form: - - PMIX_LAUNCHER_PAUSE_FOR_TOOL: %s - -The variable must be of the form (nspace:rank) of the tool requesting that -%s pause for it to connect. Please reset the value of the variable and try -again. -# -[prun:executable-incorrectly-given] -The %s command was given with an application specified. %s is only used -to start the persistent DVM - it cannot be used with an application. -# -[bad-option-input] -%s was given an option that expected a string argument: - - option: %s - argument: %s - expected: %s - -Please correct the option and try again. -# -[file-open-error] -%s was unable to open the specified file provided as an option: - - option: %s - argument: %s - file: %s - -Please correct the option and try again. -# -[bad-file] -%s was unable to read the necessary info from the provided file: - - option: %s - argument: %s - file: %s - -Please correct the option or the file and try again. -# -[bad-dvm-option] -The --dvm option was provided, but the argument -is one not recognized: - - arg: %s - -Please see "%s --help dvm" for a list of recognized -options and examples diff --git a/src/tools/pterm/Makefile.am b/src/tools/pterm/Makefile.am index cb965a5876..ceb939bb38 100644 --- a/src/tools/pterm/Makefile.am +++ b/src/tools/pterm/Makefile.am @@ -14,7 +14,7 @@ # Copyright (c) 2015-2020 Intel, Inc. All rights reserved. # Copyright (c) 2019 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. +# Copyright (c) 2021-2023 Nanook Consulting. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -26,8 +26,6 @@ AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS) bin_PROGRAMS = pterm -dist_prtedata_DATA = help-pterm.txt - pterm_SOURCES = \ pterm.c diff --git a/src/tools/pterm/help-pterm.txt b/src/tools/pterm/help-pterm.txt deleted file mode 100644 index a61f7b0141..0000000000 --- a/src/tools/pterm/help-pterm.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -*- text -*- -# -# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2007-2020 Cisco Systems, Inc. All rights reserved -# Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. -# Copyright (c) 2017-2020 Intel, Inc. All rights reserved. -# Copyright (c) 2022 Nanook Consulting. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# This is the US/English general help file for PRTE's pterm. -# -# -[no-args] -The %s command does not accept arguments other than those -specifically defined by the command. The following were -not recognized: - - Args: %s - -Please see "%s --help" for a description of all accepted -command options.