Skip to content
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

Jump to bottom

Fix some issues with tool help #1257

Merged
merged 1 commit into from
Mar 9, 2022
Merged

Fix some issues with tool help #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/pmix/pmix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ int prte_pmix_convert_status(pmix_status_t status)

case PMIX_ERROR:
return PRTE_ERROR;
case PMIX_ERR_SILENT:
return PRTE_ERR_SILENT;
case PMIX_SUCCESS:
case PMIX_OPERATION_SUCCEEDED:
return PRTE_SUCCESS;
Expand Down
24 changes: 12 additions & 12 deletions src/runtime/prte_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,18 @@ int prte_init_util(prte_proc_type_t flags)
}
util_initialized = true;

if (PMIX_SUCCESS != (ret = pmix_init_util(NULL, 0))) {
/* initialize install dirs code */
ret = prte_mca_base_framework_open(&prte_prteinstalldirs_base_framework,
PRTE_MCA_BASE_OPEN_DEFAULT);
if (PRTE_SUCCESS != ret) {
fprintf(stderr,
"prte_prteinstalldirs_base_open() failed -- process will likely abort (%s:%d, "
"returned %d instead of PRTE_SUCCESS)\n",
__FILE__, __LINE__, ret);
return ret;
}

if (PMIX_SUCCESS != (ret = pmix_init_util(NULL, 0, prte_install_dirs.prtedatadir))) {
return prte_pmix_convert_status(ret);
}

Expand All @@ -130,17 +141,6 @@ int prte_init_util(prte_proc_type_t flags)
/* initialize the output system */
prte_output_init();

/* initialize install dirs code */
ret = prte_mca_base_framework_open(&prte_prteinstalldirs_base_framework,
PRTE_MCA_BASE_OPEN_DEFAULT);
if (PRTE_SUCCESS != ret) {
fprintf(stderr,
"prte_prteinstalldirs_base_open() failed -- process will likely abort (%s:%d, "
"returned %d instead of PRTE_SUCCESS)\n",
__FILE__, __LINE__, ret);
return ret;
}

/* initialize the help system */
prte_show_help_init();

Expand Down