From 2339bf6dc37577f596d1f22e19c76387e2fe4661 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 23 Oct 2023 15:19:52 -0400 Subject: [PATCH 1/2] dpm: update PMIX attribute No longer used the ancient/deprecate PMIX_MAPBY, and instead use PMIX_DISPLAY_MAP. Signed-off-by: Jeff Squyres (cherry picked from commit 5e695cd5de406c5ad3b3a6a533952bd3801ca426) --- ompi/dpm/dpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c index 656a45d8a41..16bc764a7eb 100644 --- a/ompi/dpm/dpm.c +++ b/ompi/dpm/dpm.c @@ -24,6 +24,7 @@ * Copyright (c) 2018-2022 Triad National Security, LLC. All rights * reserved. * Copyright (c) 2022 IBM Corporation. All rights reserved. + * Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -1243,7 +1244,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[], /* check for 'display_map' - a job-level key */ ompi_info_get_bool(array_of_info[i], "display_map", &local_spawn, &flag); if ( flag ) { - rc = dpm_convert(&job_info, "display_map", PMIX_MAPBY, NULL, "DISPLAY", true); + rc = dpm_convert(&job_info, "display_map", PMIX_DISPLAY_MAP, NULL, "DISPLAY", true); if (OMPI_SUCCESS != rc) { OPAL_LIST_DESTRUCT(&job_info); OPAL_LIST_DESTRUCT(&app_info); From 4ff24834a9f6a50e666dea9ccff03619ecc72f8b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 19 Oct 2023 13:37:39 -0600 Subject: [PATCH 2/2] Update processing of "display_map" info key Translates to its own unique PMIX_DISPLAY_MAP attribute and is no longer a qualifier to the PMIX_MAPBY attr. Note that a previous commit (5e695cd on main) converted the PMIX_MAPBY attribute to PMIX_DISPLAY_MAP; this commit completes the job by updating the surrounding logic accordingly. Signed-off-by: Ralph Castain Signed-off-by: Jeff Squyres (cherry picked from commit 75e3d33991e58fadbc12997fbe8b21bd3e37c5c4) --- ompi/dpm/dpm.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c index 16bc764a7eb..25f60586893 100644 --- a/ompi/dpm/dpm.c +++ b/ompi/dpm/dpm.c @@ -1244,19 +1244,9 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[], /* check for 'display_map' - a job-level key */ ompi_info_get_bool(array_of_info[i], "display_map", &local_spawn, &flag); if ( flag ) { - rc = dpm_convert(&job_info, "display_map", PMIX_DISPLAY_MAP, NULL, "DISPLAY", true); - if (OMPI_SUCCESS != rc) { - OPAL_LIST_DESTRUCT(&job_info); - OPAL_LIST_DESTRUCT(&app_info); - PMIX_APP_FREE(apps, scount); - if (NULL != hostfiles) { - opal_argv_free(hostfiles); - } - if (NULL != dash_host) { - opal_argv_free(dash_host); - } - return MPI_ERR_SPAWN; - } + info = OBJ_NEW(opal_info_item_t); + PMIX_INFO_LOAD(&info->info, PMIX_DISPLAY_MAP, &local_spawn, PMIX_BOOL); + opal_list_append(&job_info, &info->super); } /* check for 'npernode' and 'ppr' - job-level key */