[Swift-commit] r5606 - in SwiftApps/SciColSim: . conf

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-13 17:26:06 -0600 (Mon, 13 Feb 2012)
New Revision: 5606

Modified:
   SwiftApps/SciColSim/conf/local.xml
   SwiftApps/SciColSim/conf/pads-local-coasters.xml
   SwiftApps/SciColSim/conf/pads-ssh-coasters.xml
   SwiftApps/SciColSim/swiftopt.sh
Log:
o changes to the pads template files and local template files
o minor edits to swiftopt.sh



Modified: SwiftApps/SciColSim/conf/local.xml
===================================================================
--- SwiftApps/SciColSim/conf/local.xml	2012-02-13 22:53:52 UTC (rev 5605)
+++ SwiftApps/SciColSim/conf/local.xml	2012-02-13 23:26:06 UTC (rev 5606)
@@ -1,7 +1,7 @@
 <config>
   <pool handle="local" >
     <execution provider="local" url="none" />
-    <profile namespace="karajan" key="jobThrottle">_JOB_THROTTLE_</profile>
+    <profile namespace="karajan" key="jobThrottle">_JOB_THROTTLE</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>
     <workdirectory>_WORK_</workdirectory>

Modified: SwiftApps/SciColSim/conf/pads-local-coasters.xml
===================================================================
--- SwiftApps/SciColSim/conf/pads-local-coasters.xml	2012-02-13 22:53:52 UTC (rev 5605)
+++ SwiftApps/SciColSim/conf/pads-local-coasters.xml	2012-02-13 23:26:06 UTC (rev 5606)
@@ -1,9 +1,16 @@
 <config>
+  <pool handle="local" >
+    <execution provider="local" url="none" />
+    <profile namespace="karajan" key="jobThrottle">0.09</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <filesystem provider="local"/>
+    <workdirectory>_WORK_</workdirectory>
+  </pool>
   <pool handle="pads-local-coasters">
     <execution provider="coaster" jobmanager="local:pbs" />
     <filesystem provider="local"/>
     <workdirectory>_WORK_</workdirectory>
-    
+
     <profile namespace="globus" key="project">CI-CCR000013</profile>
     <profile namespace="globus" key="ppn">8</profile>
     <profile namespace="globus" key="jobsPerNode">1</profile>

Modified: SwiftApps/SciColSim/conf/pads-ssh-coasters.xml
===================================================================
--- SwiftApps/SciColSim/conf/pads-ssh-coasters.xml	2012-02-13 22:53:52 UTC (rev 5605)
+++ SwiftApps/SciColSim/conf/pads-ssh-coasters.xml	2012-02-13 23:26:06 UTC (rev 5606)
@@ -1,9 +1,16 @@
 <config>
-  <pool handle="pads">
+  <pool handle="local" >
+    <execution provider="local" url="none" />
+    <profile namespace="karajan" key="jobThrottle">0.09</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <filesystem provider="local"/>
+    <workdirectory>_WORK_</workdirectory>
+  </pool>
+  <pool handle="pads-ssh-coasters">
     <execution provider="pads-ssh-coasters" jobmanager="ssh:pbs" url="login.pads.ci.uchicago.edu" />
     <filesystem provider="local"/>
     <workdirectory>_WORK_</workdirectory>
-    
+
     <profile namespace="globus" key="project">CI-CCR000013</profile>
     <profile namespace="globus" key="ppn">8</profile>
     <profile namespace="globus" key="jobsPerNode">1</profile>

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-13 22:53:52 UTC (rev 5605)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-13 23:26:06 UTC (rev 5606)
@@ -19,6 +19,8 @@
 dryrun=
 escapecode=$(printf '\033')
 
+fixed_params=2     # Currently CONSTANT, will want to have this vary
+
 # Process command line arguments
 
 while [ $# -gt 0 ]; do
@@ -54,8 +56,6 @@
 
 cp params/$paramfile $rundir/paramfile
 
-
-
 sed -e '/^[[:space:]]*\(#.*\)*$/d' -e 's/#.*//' -e 's/  */=/' -e 's/^/export /' <params/$paramfile >$rundir/params.annealing
 source $rundir/params.annealing
 
@@ -80,21 +80,21 @@
 
 # Echo runtime estimates
 
-total_jobs=`python -c "from math import ceil; print int(ceil(($max_target_innovation.00 - $min_target_innovation.00)/$target_innovation_increment.00) * $annealing_repeats * 2 * $annealing_cycles * ($evolve_reruns/$reruns_per_opt_invocation) * $nworkers)"`
+total_jobs=`python -c "from math import ceil; print int(ceil(($max_target_innovation.00 - $min_target_innovation.00)/$target_innovation_increment.00) * $annealing_repeats * $fixed_params * $annealing_cycles * ($evolve_reruns/$reruns_per_opt_invocation) * $nworkers)"`
 echo Total jobs = $total_jobs
 
 cd $rundir
 
-if [ _$dryrun != _ ]; then
-  exit 0
-fi
-
 # Do the run
 
 export WORK=$PWD/swiftwork
 
-SWIFT_HOME=../swift/bin ../swift/bin/gensites ../conf/$execsite.xml > $execsite.xml
+SWIFT_HOME=../swift/bin ../swift/bin/gensites ../conf/$execsite.XML > $execsite.xml
 
+if [ _$dryrun != _ ]; then
+  exit 0
+fi
+
 SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift -e33="$escapecode" \
                                          \
 -minrange=$min_target_innovation         \