From 59645c5c8e2adbb650df6bd8a5c5832e546b04dc Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sun, 30 Aug 2009 15:57:27 +0000 Subject: [PATCH] Per direction from the slurm team, change the envar we look at to get our allocation This commit was SVN r21915. --- orte/mca/ras/slurm/ras_slurm_module.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/orte/mca/ras/slurm/ras_slurm_module.c b/orte/mca/ras/slurm/ras_slurm_module.c index 9991a5fd94..7cb59555f4 100644 --- a/orte/mca/ras/slurm/ras_slurm_module.c +++ b/orte/mca/ras/slurm/ras_slurm_module.c @@ -86,18 +86,12 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) } regexp = strdup(slurm_node_str); - tasks_per_node = getenv("SLURM_JOB_CPUS_PER_NODE"); + tasks_per_node = getenv("SLURM_TASKS_PER_NODE"); if (NULL == tasks_per_node) { - /* didn't find SLURM 1.2 or above envar - look for prior - * version - */ - tasks_per_node = getenv("SLURM_TASKS_PER_NODE"); - if (NULL == tasks_per_node) { - /* couldn't find any version - abort */ - orte_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, - "SLURM_JOB_CPUS_PER NODE or SLURM_TASKS_PER_NODE"); - return ORTE_ERR_NOT_FOUND; - } + /* couldn't find any version - abort */ + orte_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, + "SLURM_TASKS_PER_NODE"); + return ORTE_ERR_NOT_FOUND; } node_tasks = strdup(tasks_per_node);