This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via c6cb772b0bb750cde36599e539efed76a0a1da59 (commit) via 705360e9dd45cb4ca9f74bbe1dc1ded2118d6083 (commit) from 28e63b31da4b3d024a9fce064487d367671b522f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/c6cb772b0bb750cde36599e539efed76a0... commit c6cb772b0bb750cde36599e539efed76a0a1da59 Author: Pavan Balaji <[email protected]> Date: Wed Jan 1 11:17:13 2014 -0600 Bug-fix: reset the rmk when the hostlist came from the user. If the user directly provided the host list or if the user provided a modifier to the list of hosts we obtained from the resource manager (e.g., changed the number of processes per node, or sorted them), we consider the host list as user-provided. Fixes #1575. Signed-off-by: Junchao Zhang <[email protected]> diff --git a/src/pm/hydra/ui/mpich/mpiexec.c b/src/pm/hydra/ui/mpich/mpiexec.c index 38dddc1..282eaba 100644 --- a/src/pm/hydra/ui/mpich/mpiexec.c +++ b/src/pm/hydra/ui/mpich/mpiexec.c @@ -174,7 +174,12 @@ int main(int argc, char **argv) user_provided_host_list = 0; - if (HYD_server_info.node_list == NULL) { + if (HYD_server_info.node_list) { + /* If we already have a host list at this point, it must have + * come from the user */ + user_provided_host_list = 1; + } + else { /* Node list is not created yet. The user might not have * provided the host file. Query the RMK. */ status = HYDT_bsci_query_node_list(&HYD_server_info.node_list); http://git.mpich.org/mpich.git/commitdiff/705360e9dd45cb4ca9f74bbe1dc1ded211... commit 705360e9dd45cb4ca9f74bbe1dc1ded2118d6083 Author: Pavan Balaji <[email protected]> Date: Wed Jan 1 11:14:44 2014 -0600 Change variable name and add more comments. Signed-off-by: Junchao Zhang <[email protected]> diff --git a/src/pm/hydra/ui/mpich/mpiexec.c b/src/pm/hydra/ui/mpich/mpiexec.c index b38b2c6..38dddc1 100644 --- a/src/pm/hydra/ui/mpich/mpiexec.c +++ b/src/pm/hydra/ui/mpich/mpiexec.c @@ -132,7 +132,7 @@ int main(int argc, char **argv) struct HYD_proxy *proxy; struct HYD_exec *exec; struct HYD_node *node; - int exit_status = 0, i, timeout, reset_rmk, global_core_count; + int exit_status = 0, i, timeout, user_provided_host_list, global_core_count; HYD_status status = HYD_SUCCESS; HYDU_FUNC_ENTER(); @@ -172,7 +172,7 @@ int main(int argc, char **argv) HYD_server_info.user_global.enablex, HYD_server_info.user_global.debug); HYDU_ERR_POP(status, "unable to initialize the bootstrap server\n"); - reset_rmk = 0; + user_provided_host_list = 0; if (HYD_server_info.node_list == NULL) { /* Node list is not created yet. The user might not have @@ -190,7 +190,7 @@ int main(int argc, char **argv) status = HYDU_add_to_node_list(localhost, 1, &HYD_server_info.node_list); HYDU_ERR_POP(status, "unable to add to node list\n"); - reset_rmk = 1; + user_provided_host_list = 1; } } @@ -218,17 +218,23 @@ int main(int argc, char **argv) if (HYD_ui_mpich_info.ppn != -1) { for (node = HYD_server_info.node_list; node; node = node->next) node->core_count = HYD_ui_mpich_info.ppn; - reset_rmk = 1; + + /* The user modified how we look at the lists of hosts, so we + * consider it a user-provided host list */ + user_provided_host_list = 1; } /* The RMK returned a node list. See if the user requested us to * manipulate it in some way */ if (HYD_ui_mpich_info.sort_order != NONE) { qsort_node_list(); - reset_rmk = 1; + + /* The user modified how we look at the lists of hosts, so we + * consider it a user-provided host list */ + user_provided_host_list = 1; } - if (reset_rmk) { + if (user_provided_host_list) { /* Reassign node IDs to each node */ for (node = HYD_server_info.node_list, i = 0; node; node = node->next, i++) node->node_id = i; ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/ui/mpich/mpiexec.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository