|
20 | 20 | * Copyright (c) 2014-2020 Research Organization for Information Science
|
21 | 21 | * and Technology (RIST). All rights reserved.
|
22 | 22 | * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
|
23 |
| - * Copyright (c) 2021 Nanook Consulting. All rights reserved. |
| 23 | + * Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. |
24 | 24 | * Copyright (c) 2018-2022 Triad National Security, LLC. All rights
|
25 | 25 | * reserved.
|
26 | 26 | * Copyright (c) 2022 IBM Corporation. All rights reserved.
|
@@ -1595,18 +1595,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
|
1595 | 1595 | opal_list_append(&job_info, &info->super);
|
1596 | 1596 | }
|
1597 | 1597 |
|
1598 |
| - /* spawn procs */ |
1599 |
| - ninfo = opal_list_get_size(&job_info); |
1600 |
| - if (0 < ninfo) { |
1601 |
| - PMIX_INFO_CREATE(pinfo, ninfo); |
1602 |
| - n = 0; |
1603 |
| - OPAL_LIST_FOREACH(info, &job_info, opal_info_item_t) { |
1604 |
| - PMIX_INFO_XFER(&pinfo[n], &info->info); |
1605 |
| - ++n; |
1606 |
| - } |
1607 |
| - } |
1608 |
| - OPAL_LIST_DESTRUCT(&job_info); |
1609 |
| - |
1610 | 1598 | if (opal_process_info.is_singleton) {
|
1611 | 1599 | /* The GDS 'hash' component is known to work for singleton, so
|
1612 | 1600 | * recommend it. The user may set this envar to override the setting.
|
@@ -1645,6 +1633,18 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
|
1645 | 1633 | opal_argv_free(dash_host);
|
1646 | 1634 | }
|
1647 | 1635 |
|
| 1636 | + /* spawn procs */ |
| 1637 | + ninfo = opal_list_get_size(&job_info); |
| 1638 | + if (0 < ninfo) { |
| 1639 | + PMIX_INFO_CREATE(pinfo, ninfo); |
| 1640 | + n = 0; |
| 1641 | + OPAL_LIST_FOREACH(info, &job_info, opal_info_item_t) { |
| 1642 | + PMIX_INFO_XFER(&pinfo[n], &info->info); |
| 1643 | + ++n; |
| 1644 | + } |
| 1645 | + } |
| 1646 | + OPAL_LIST_DESTRUCT(&job_info); |
| 1647 | + |
1648 | 1648 | pret = PMIx_Spawn(pinfo, ninfo, apps, count, nspace);
|
1649 | 1649 | rc = opal_pmix_convert_status(pret);
|
1650 | 1650 | if (NULL != pinfo) {
|
@@ -2046,7 +2046,6 @@ static int start_dvm(char **hostfiles, char **dash_host)
|
2046 | 2046 | opal_asprintf(&tmp, "%d", death_pipe[0]);
|
2047 | 2047 | opal_argv_append_nosize(&args, tmp);
|
2048 | 2048 | free(tmp);
|
2049 |
| - opal_argv_append_nosize(&args, "--daemonize"); |
2050 | 2049 |
|
2051 | 2050 | /* Fork off the child */
|
2052 | 2051 | pid = fork();
|
|
0 commit comments