Skip to content

Commit 732306a

Browse files
authored
Merge pull request #12015 from jsquyres/pr/v5.0.x/fix-pmix-display_map
v5.0.x: dpm: update PMIX attribute
2 parents 934e241 + 4ff2483 commit 732306a

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

ompi/dpm/dpm.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* Copyright (c) 2018-2022 Triad National Security, LLC. All rights
2525
* reserved.
2626
* Copyright (c) 2022 IBM Corporation. All rights reserved.
27+
* Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
2728
* $COPYRIGHT$
2829
*
2930
* Additional copyrights may follow
@@ -1243,19 +1244,9 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12431244
/* check for 'display_map' - a job-level key */
12441245
ompi_info_get_bool(array_of_info[i], "display_map", &local_spawn, &flag);
12451246
if ( flag ) {
1246-
rc = dpm_convert(&job_info, "display_map", PMIX_MAPBY, NULL, "DISPLAY", true);
1247-
if (OMPI_SUCCESS != rc) {
1248-
OPAL_LIST_DESTRUCT(&job_info);
1249-
OPAL_LIST_DESTRUCT(&app_info);
1250-
PMIX_APP_FREE(apps, scount);
1251-
if (NULL != hostfiles) {
1252-
opal_argv_free(hostfiles);
1253-
}
1254-
if (NULL != dash_host) {
1255-
opal_argv_free(dash_host);
1256-
}
1257-
return MPI_ERR_SPAWN;
1258-
}
1247+
info = OBJ_NEW(opal_info_item_t);
1248+
PMIX_INFO_LOAD(&info->info, PMIX_DISPLAY_MAP, &local_spawn, PMIX_BOOL);
1249+
opal_list_append(&job_info, &info->super);
12591250
}
12601251

12611252
/* check for 'npernode' and 'ppr' - job-level key */

0 commit comments

Comments
 (0)