Once again, bloody SLURM changes the envars and breaks things. Try and track their changes so we get a correct allocation.

This commit was SVN r27302.

orte/mca/ras/slurm/ras_slurm_module.c

@@ -88,12 +88,16 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes)
     }
     regexp = strdup(slurm_node_str);
     
-    tasks_per_node = getenv("SLURM_TASKS_PER_NODE");
+    tasks_per_node = getenv("SLURM_JOB_CPUS_PER_NODE");
     if (NULL == tasks_per_node) {
-        /* couldn't find any version - abort */
+        /* try an older variation */
-        orte_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1,
+        tasks_per_node = getenv("SLURM_TASKS_PER_NODE");
-                       "SLURM_TASKS_PER_NODE");
+        if (NULL == 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);