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 2a90c3644882f5ef805fed0f8add5c3ccbf3bd0e (commit) from f322ce7966f429aab1d54c258aa3a37d8c58629c (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/2a90c3644882f5ef805fed0f8add5c3ccb... commit 2a90c3644882f5ef805fed0f8add5c3ccbf3bd0e Author: Pavan Balaji <[email protected]> Date: Fri Jun 7 08:50:57 2013 -0500 Check for env variables we plan to use before picking slurm. diff --git a/src/pm/hydra/tools/bootstrap/external/slurm_query_native_int.c b/src/pm/hydra/tools/bootstrap/external/slurm_query_native_int.c index 852f394..a29ec57 100644 --- a/src/pm/hydra/tools/bootstrap/external/slurm_query_native_int.c +++ b/src/pm/hydra/tools/bootstrap/external/slurm_query_native_int.c @@ -18,10 +18,12 @@ HYD_status HYDT_bscd_slurm_query_native_int(int *ret) if (!HYDTI_bscd_env_is_avail("SLURM_NODELIST")) *ret = 0; - if (!HYDTI_bscd_env_is_avail("SLURM_JOB_CPUS_PER_NODE")) - *ret = 0; if (!HYDTI_bscd_env_is_avail("SLURM_NNODES")) *ret = 0; + if (!HYDTI_bscd_env_is_avail("SLURM_TASKS_PER_NODE")) + *ret = 0; + if (!HYDTI_bscd_env_is_avail("SLURM_NODEID")) + *ret = 0; fn_exit: HYDU_FUNC_EXIT(); ----------------------------------------------------------------------- Summary of changes: .../bootstrap/external/slurm_query_native_int.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository