[Swift-commit] cog r3551

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3551 | davidkelly999 | 2013-01-11 18:20:56 -0600 (Fri, 11 Jan 2013) | 2 lines

Use ibrun is available (TACC), otherwise use srun

------------------------------------------------------------------------
Index: modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/slurm/SlurmExecutor.java
===================================================================
--- modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/slurm/SlurmExecutor.java	(revision 3550)
+++ modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/slurm/SlurmExecutor.java	(working copy)
@@ -165,8 +165,9 @@
 				logger.debug("Wrapper after variable substitution: " + wrapper);
 			}
 		}
-		
-		wr.write(getProperties().getRunCommand() + " /bin/bash -c \'");
+	        
+                wr.write("RUNCOMMAND=$( command -v ibrun || command -v srun )\n");
+		wr.write("$RUNCOMMAND /bin/bash -c \'");
 		if (spec.getDirectory() != null) {
 			wr.write("cd " + quote(spec.getDirectory()) + " && ");
 		}
@@ -234,4 +235,4 @@
         return outArray[outArray.length-1].trim();
     }
     
-}
\ No newline at end of file
+}