From 5f65e21a1a88dad24460ab755c0e0a289e7572d2 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 15 Oct 2024 00:35:12 -0600 Subject: [PATCH] Pull a couple of fixes from master branch Backport a couple of minor fixes that were included in a PR to master branch. Signed-off-by: Ralph Castain (cherry-picked from commit 52a47b44b2c8b970c1e942434de814105eda40a5) --- src/mca/rmaps/base/rmaps_base_map_job.c | 2 +- src/mca/rmaps/round_robin/rmaps_rr_mappers.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mca/rmaps/base/rmaps_base_map_job.c b/src/mca/rmaps/base/rmaps_base_map_job.c index 51706ab267..e48675acaf 100644 --- a/src/mca/rmaps/base/rmaps_base_map_job.c +++ b/src/mca/rmaps/base/rmaps_base_map_job.c @@ -468,7 +468,7 @@ void prte_rmaps_base_map_job(int fd, short args, void *cbdata) #else } else if (HWLOC_OBJ_L1CACHE == options.maptype || HWLOC_OBJ_L2CACHE == options.maptype || - HWLOC_OBJ_L1CACHE == options.maptype) { + HWLOC_OBJ_L3CACHE == options.maptype) { /* add in #cache for each node */ PMIX_LIST_FOREACH (node, &nodes, prte_node_t) { app->num_procs += options.pprn * prte_hwloc_base_get_nbobjs_by_type(node->topology->topo, diff --git a/src/mca/rmaps/round_robin/rmaps_rr_mappers.c b/src/mca/rmaps/round_robin/rmaps_rr_mappers.c index 86c72f7143..4c193f8613 100644 --- a/src/mca/rmaps/round_robin/rmaps_rr_mappers.c +++ b/src/mca/rmaps/round_robin/rmaps_rr_mappers.c @@ -708,6 +708,9 @@ int prte_rmaps_rr_byobj(prte_job_t *jdata, prte_app_context_t *app, } errout: + if (PRTE_ERR_SILENT == rc) { + return rc; + } if (outofcpus) { /* ran out of cpus */ pmix_show_help("help-prte-rmaps-base.txt",