Skip to content

v5.0: Fix singleton operations #11227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2022
Merged

v5.0: Fix singleton operations #11227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rd-party/openpmix
Open in desktop
Submodule openpmix updated 167 files
2 changes: 1 addition & 1 deletion 3rd-party/prrte
Open in desktop
Submodule prrte updated 110 files
27 changes: 13 additions & 14 deletions ompi/dpm/dpm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Copyright (c) 2014-2020 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
* Copyright (c) 2018-2022 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2022 IBM Corporation. All rights reserved.
Expand Down Expand Up @@ -1596,18 +1596,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
opal_list_append(&job_info, &info->super);
}

/* spawn procs */
ninfo = opal_list_get_size(&job_info);
if (0 < ninfo) {
PMIX_INFO_CREATE(pinfo, ninfo);
n = 0;
OPAL_LIST_FOREACH(info, &job_info, opal_info_item_t) {
PMIX_INFO_XFER(&pinfo[n], &info->info);
++n;
}
}
OPAL_LIST_DESTRUCT(&job_info);

if (opal_process_info.is_singleton) {
/* The GDS 'hash' component is known to work for singleton, so
* recommend it. The user may set this envar to override the setting.
Expand Down Expand Up @@ -1646,6 +1634,18 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
opal_argv_free(dash_host);
}

/* spawn procs */
ninfo = opal_list_get_size(&job_info);
if (0 < ninfo) {
PMIX_INFO_CREATE(pinfo, ninfo);
n = 0;
OPAL_LIST_FOREACH(info, &job_info, opal_info_item_t) {
PMIX_INFO_XFER(&pinfo[n], &info->info);
++n;
}
}
OPAL_LIST_DESTRUCT(&job_info);

pret = PMIx_Spawn(pinfo, ninfo, apps, count, nspace);
rc = opal_pmix_convert_status(pret);
if (NULL != pinfo) {
Expand Down Expand Up @@ -2047,7 +2047,6 @@ static int start_dvm(char **hostfiles, char **dash_host)
opal_asprintf(&tmp, "%d", death_pipe[0]);
opal_argv_append_nosize(&args, tmp);
free(tmp);
opal_argv_append_nosize(&args, "--daemonize");

/* Fork off the child */
pid = fork();
Expand Down