Skip to content

CLI cleanups #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjhursey merged 2 commits into from
Mar 11, 2021
Merged

CLI cleanups #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0dcaa0
prte: Remove stale CLI options.
rajachan Feb 16, 2021
ad55b39
Limit --default-hostfile to prterun and prte
rajachan Mar 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/mca/schizo/prte/schizo_prte.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
{ '\0', "machinefile", 1, PRTE_CMD_LINE_TYPE_STRING,
"Provide a hostfile",
PRTE_CMD_LINE_OTYPE_LAUNCH },
{ '\0', "default-hostfile", 1, PRTE_CMD_LINE_TYPE_STRING,
"Provide a default hostfile",
PRTE_CMD_LINE_OTYPE_LAUNCH },
{ 'H', "host", 1, PRTE_CMD_LINE_TYPE_STRING,
"List of hosts to invoke processes on",
PRTE_CMD_LINE_OTYPE_LAUNCH },
Expand Down
20 changes: 4 additions & 16 deletions src/tools/prte/prte.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
{ '\0', "launch-agent", 1, PRTE_CMD_LINE_TYPE_STRING,
"Name of daemon executable used to start processes on remote nodes (default: prted)",
PRTE_CMD_LINE_OTYPE_DVM },
{ '\0', "report-pid", 1, PRTE_CMD_LINE_TYPE_STRING,
"Printout pid on stdout [-], stderr [+], or a file [anything else]",
PRTE_CMD_LINE_OTYPE_DVM },
{ '\0', "report-uri", 1, PRTE_CMD_LINE_TYPE_STRING,
"Printout URI on stdout [-], stderr [+], or a file [anything else]",
PRTE_CMD_LINE_OTYPE_DVM },
Expand Down Expand Up @@ -277,10 +274,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {


/* Launch options */
/* request that argv[0] be indexed */
{ '\0', "index-argv-by-rank", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Uniquely index argv[0] for each process using its rank",
PRTE_CMD_LINE_OTYPE_LAUNCH },
/* Preload the binary on the remote machine */
{ 's', "preload-binary", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Preload the binary on the remote machine before starting the remote process.",
Expand Down Expand Up @@ -312,13 +305,13 @@ static prte_cmd_line_init_t cmd_line_init[] = {
{ '\0', "pset", 1, PRTE_CMD_LINE_TYPE_STRING,
"User-specified name assigned to the processes in their given application",
PRTE_CMD_LINE_OTYPE_LAUNCH },

/* Set default global hostfile */
{ '\0', "default-hostfile", 1, PRTE_CMD_LINE_TYPE_STRING,
"Provide a default hostfile",
PRTE_CMD_LINE_OTYPE_LAUNCH },


/* Developer options */
{ '\0', "do-not-resolve", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Do not attempt to resolve interfaces - usually used to determine proposed process placement/binding prior to obtaining an allocation",
PRTE_CMD_LINE_OTYPE_DEVEL },
{ '\0', "do-not-launch", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Perform all necessary operations to prepare to launch the application, but do not actually launch it (usually used to test mapping patterns)",
PRTE_CMD_LINE_OTYPE_DEVEL },
Expand Down Expand Up @@ -937,11 +930,6 @@ int main(int argc, char *argv[])
PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_STDIN_TGT, pval->value.data.string, PMIX_STRING);
}

/* if we want the argv's indexed, indicate that */
if (prte_cmd_line_is_taken(prte_cmd_line, "index-argv-by-rank")) {
PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_INDEX_ARGV, NULL, PMIX_BOOL);
}

if (NULL != (pval = prte_cmd_line_get_param(prte_cmd_line, "map-by", 0, 0))) {
if (donotlaunch && NULL == strcasestr(pval->value.data.string, "donotlaunch")) {
/* must add directive */
Expand Down
12 changes: 0 additions & 12 deletions src/tools/prun/prun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {


/* Launch options */
/* request that argv[0] be indexed */
{ '\0', "index-argv-by-rank", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Uniquely index argv[0] for each process using its rank",
PRTE_CMD_LINE_OTYPE_LAUNCH },
/* Preload the binary on the remote machine */
{ 's', "preload-binary", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Preload the binary on the remote machine before starting the remote process.",
Expand Down Expand Up @@ -298,9 +294,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {


/* Developer options */
{ '\0', "do-not-resolve", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Do not attempt to resolve interfaces - usually used to determine proposed process placement/binding prior to obtaining an allocation",
PRTE_CMD_LINE_OTYPE_DEVEL },
{ '\0', "do-not-launch", 0, PRTE_CMD_LINE_TYPE_BOOL,
"Perform all necessary operations to prepare to launch the application, but do not actually launch it (usually used to test mapping patterns)",
PRTE_CMD_LINE_OTYPE_DEVEL },
Expand Down Expand Up @@ -972,11 +965,6 @@ int prun(int argc, char *argv[])
PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_STDIN_TGT, pval->value.data.string, PMIX_STRING);
}

/* if we want the argv's indexed, indicate that */
if (prte_cmd_line_is_taken(prte_cmd_line, "index-argv-by-rank")) {
PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_INDEX_ARGV, &flag, PMIX_BOOL);
}

if (NULL != (pval = prte_cmd_line_get_param(prte_cmd_line, "map-by", 0, 0))) {
PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_MAPBY, pval->value.data.string, PMIX_STRING);
if (NULL != strcasestr(pval->value.data.string, "DONOTLAUNCH")) {
Expand Down