[Swift-commit] r5535 - SwiftApps/SciColSim

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2012-01-31 13:14:32 -0600 (Tue, 31 Jan 2012)
New Revision: 5535

Modified:
   SwiftApps/SciColSim/annealing.swift
   SwiftApps/SciColSim/sites.beagle.xml
   SwiftApps/SciColSim/tc
Log:
parameterized nworkers

Modified: SwiftApps/SciColSim/annealing.swift
===================================================================
--- SwiftApps/SciColSim/annealing.swift	2012-01-31 14:09:53 UTC (rev 5534)
+++ SwiftApps/SciColSim/annealing.swift	2012-01-31 19:14:32 UTC (rev 5535)
@@ -10,7 +10,7 @@
 
 global boolean FIX_VARIABLES = true;
 global int var_fixed[] = [1,1,0,0,0];
-global int Nworkers = 4;
+global int Nworkers = @toint(@arg("nworkers","4"));
 global int rerunsPerApp;
 
 (float nx) newx(float x, float dx) 

Modified: SwiftApps/SciColSim/sites.beagle.xml
===================================================================
--- SwiftApps/SciColSim/sites.beagle.xml	2012-01-31 14:09:53 UTC (rev 5534)
+++ SwiftApps/SciColSim/sites.beagle.xml	2012-01-31 19:14:32 UTC (rev 5535)
@@ -7,8 +7,8 @@
 
     <profile namespace="globus" key="jobsPerNode">24</profile>
     <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
-    <profile namespace="globus" key="maxTime">7300</profile>
-    <profile namespace="globus" key="maxWallTime">0:02:00</profile>
+    <profile namespace="globus" key="maxTime">1800</profile>
+    <profile namespace="globus" key="maxWallTime">1</profile>
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="nodeGranularity">1</profile>
     <profile namespace="globus" key="maxNodes">1</profile>

Modified: SwiftApps/SciColSim/tc
===================================================================
--- SwiftApps/SciColSim/tc	2012-01-31 14:09:53 UTC (rev 5534)
+++ SwiftApps/SciColSim/tc	2012-01-31 19:14:32 UTC (rev 5535)
@@ -5,11 +5,11 @@
 mcs cat /bin/cat null null null
 localhost catnap /home/wilde/swift/lab/catnap.sh null null GLOBUS::maxwalltime="00:01:00"
 
-beagle optimizer /home/wilde/AndreysOptimizer/src/Optimizer null null GLOBUS::maxwalltime="01:00:00"
-beagle optimizersh /home/wilde/AndreysOptimizer/src/optimizer.sh null null GLOBUS::maxwalltime="02:00:00"
+beagle optimizer /home/wilde/AndreysOptimizer/src/Optimizer null null null
+beagle optimizersh /home/wilde/AndreysOptimizer/src/optimizer.sh null null null
 
-beagle evolve /home/wilde/AndreysOptimizer/src/evolve.sh null null GLOBUS::maxwalltime="02:00:00"
+beagle evolve /home/wilde/AndreysOptimizer/src/evolve.sh null null null
 localhost evolve /home/wilde/AndreysOptimizer/src/evolve.sh null null GLOBUS::maxwalltime="02:00:00"
 
-beagle sumloss /home/wilde/AndreysOptimizer/src/sumloss.sh null null GLOBUS::maxwalltime="02:00:00"
+beagle sumloss /home/wilde/AndreysOptimizer/src/sumloss.sh null null null
 localhost sumloss /home/wilde/AndreysOptimizer/src/sumloss.sh null null GLOBUS::maxwalltime="02:00:00"