From 9801584404de2e34b9280cefd1ffcade0be2bd49 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 22 Nov 2022 14:45:36 -0500 Subject: [PATCH 1/2] Revert "ofi/common: use verbosity level to control" This reverts commit d642af133b782b857218975056a9afac8801dcc1. --- opal/mca/common/ofi/common_ofi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opal/mca/common/ofi/common_ofi.c b/opal/mca/common/ofi/common_ofi.c index 8374c33e68d..d93d2627342 100644 --- a/opal/mca/common/ofi/common_ofi.c +++ b/opal/mca/common/ofi/common_ofi.c @@ -561,13 +561,11 @@ static uint32_t get_package_rank(opal_process_info_t *process_info) } #endif - // Get the local peers - note there may not always be local peers,e.g. .singleton launch case + // Get the local peers OPAL_MODEX_RECV_VALUE(rc, PMIX_LOCAL_PEERS, &pname, &local_peers, PMIX_STRING); if (PMIX_SUCCESS != rc || NULL == local_peers) { // We can't find package_rank, fall back to procid - if (10 <= opal_common_ofi_verbose_level) { - opal_show_help("help-common-ofi.txt", "package_rank failed", true, 10); - } + opal_show_help("help-common-ofi.txt", "package_rank failed", true); return (uint32_t) process_info->myprocid.rank; } peers = opal_argv_split(local_peers, ','); From df1691aeef6edcdfb3626d24b3fc125efcc5e32e Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Tue, 22 Nov 2022 15:05:25 -0500 Subject: [PATCH 2/2] singleton: better fix for quieting ofi common about not knowing about local peers. Because with a singleton there aren't local peers so don't emit a message about locality to devices. Signed-off-by: Howard Pritchard --- opal/mca/common/ofi/common_ofi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/opal/mca/common/ofi/common_ofi.c b/opal/mca/common/ofi/common_ofi.c index d93d2627342..f15a8080bc9 100644 --- a/opal/mca/common/ofi/common_ofi.c +++ b/opal/mca/common/ofi/common_ofi.c @@ -553,6 +553,14 @@ static uint32_t get_package_rank(opal_process_info_t *process_info) pname.jobid = OPAL_PROC_MY_NAME.jobid; pname.vpid = OPAL_VPID_WILDCARD; + /* + * if we are a singleton just return myprocid.rank + * because we by definition don't know about any local peers + */ + if (opal_process_info.is_singleton) { + return (uint32_t) process_info->myprocid.rank; + } + #if HAVE_DECL_PMIX_PACKAGE_RANK // Try to get the PACKAGE_RANK from PMIx OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_PACKAGE_RANK, &pname, &package_rank_ptr, PMIX_UINT16);