Fixing SLURM environment parsing

This patch fixes parsing of the slurm environment in the presence of running different SLURM steps with different number of tasks and nodes.
STEllAR-GROUP · Sep 11, 2017 · 1981b99 · 1981b99
1 parent 23d9710
commit 1981b99
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/util/batch_environments/slurm_environment.cpp b/src/util/batch_environments/slurm_environment.cpp
@@ -61,9 +61,9 @@ namespace hpx { namespace util { namespace batch_environments
 
     void slurm_environment::retrieve_number_of_localities(bool debug)
     {
-        char* tasks_per_node = std::getenv("SLURM_TASKS_PER_NODE");
-        char *total_num_tasks = std::getenv("SLURM_NTASKS");
-        char *num_nodes = std::getenv("SLURM_NNODES");
+        char* tasks_per_node = std::getenv("SLURM_STEP_TASKS_PER_NODE");
+        char *total_num_tasks = std::getenv("SLURM_STEP_NUM_TASKS");
+        char *num_nodes = std::getenv("SLURM_STEP_NUM_NODES");
 
         if(total_num_tasks)
         {
@@ -78,7 +78,7 @@ namespace hpx { namespace util { namespace batch_environments
         if (tasks_per_node)
         {
             if (debug) {
-                std::cerr << "SLURM tasks per node found (SLURM_TASKS_PER_NODE): "
+                std::cerr << "SLURM tasks per node found (SLURM_STEP_TASKS_PER_NODE): "
                     << tasks_per_node << std::endl;
             }
 
@@ -274,11 +274,11 @@ namespace hpx { namespace util { namespace batch_environments
     void slurm_environment::retrieve_nodelist(std::vector<std::string> & nodes,
         bool debug)
     {
-        char* slurm_nodelist_env = std::getenv("SLURM_NODELIST");
+        char* slurm_nodelist_env = std::getenv("SLURM_STEP_NODELIST");
         if (slurm_nodelist_env)
         {
             if (debug) {
-                std::cerr << "SLURM nodelist found (SLURM_NODELIST): "
+                std::cerr << "SLURM nodelist found (SLURM_STEP_NODELIST): "
                     << slurm_nodelist_env << std::endl;
             }
 
@@ -324,7 +324,7 @@ namespace hpx { namespace util { namespace batch_environments
             if (!qi::parse(begin, end, nodelist) || begin != end)
             {
                 if (debug) {
-                    std::cerr << "failed to parse SLURM nodelist (SLURM_NODELIST): "
+                    std::cerr << "failed to parse SLURM nodelist (SLURM_STEP_NODELIST): "
                         << slurm_nodelist_env << std::endl;
                 }
             }