From 5692d3a06f9f3457496c9180d1642c695d9929ca Mon Sep 17 00:00:00 2001 From: Austen Lauria Date: Wed, 9 Mar 2022 12:54:58 -0500 Subject: [PATCH] Fix two small bugs with --help. - Pass the helpdir to pmix_init_util(). This will trickle down the pmix_show_help_init(), which will be added to the pmix_show_help search path. Otherwise, PMIx will have no way to know where the PRTE tools help files are. - Add missing PMIX_ERR_SILENT -> PRTE_ERR_SILENT. This was causing the prte command parsing to print an extra line with -h. Signed-off-by: Austen Lauria --- src/pmix/pmix.c | 2 ++ src/runtime/prte_init.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pmix/pmix.c b/src/pmix/pmix.c index 89aa05d9ad..f22fefbcdf 100644 --- a/src/pmix/pmix.c +++ b/src/pmix/pmix.c @@ -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; diff --git a/src/runtime/prte_init.c b/src/runtime/prte_init.c index 9587fa0173..9eff5bf569 100644 --- a/src/runtime/prte_init.c +++ b/src/runtime/prte_init.c @@ -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); } @@ -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();