[Swift-devel] Fix needed for ppn for non-coaster pbs provider

[Michael Wilde]

The recent ppn changes need a small change to work in the case of the PBS provider running without coasters. This causes it to put this in the .submit file:

#PBS -l ppn=8

...which PBS rejects.  The line needs to be:

#PBS -l nodes=1:ppn=8

(as alluded to in the comments in PBSExecutor.java)

Fixing it as above when count is not specified seems to work on PADS.

svn diff is below.
I did not commit this. Should I? To trunk, 0.92 branch, or both?

- Mike


login1$ cd /home/wilde/swift/src/0.92/cog/modules/provider-localscheduler/
login1$ svn diff
Index: src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java
===================================================================
--- src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java	(revision 3046)
+++ src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java	(working copy)
@@ -68,7 +68,7 @@
 	        //   1. assuming count=1 when count is missing
 	        //   2. not specifying PPN when count is missing
 	        // ... are any better
-	        wr.write("#PBS -l ppn=" + ppn + "\n");
+	        wr.write("#PBS -l nodes=1:ppn=" + ppn + "\n");
 	    }
 	}
 
login1$ 


-- 
Michael Wilde
Computation Institute, University of Chicago
Mathematics and Computer Science Division
Argonne National Laboratory