[Swift-commit] r5729 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-03-27 11:27:09 -0500 (Tue, 27 Mar 2012)
New Revision: 5729

Modified:
   SwiftApps/SciColSim/swiftopt.sh
Log:
changed to a more accurate calculation of the number of app calls necessary. still now correct though



Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-03-26 23:10:25 UTC (rev 5728)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-03-27 16:27:09 UTC (rev 5729)
@@ -35,10 +35,10 @@
 # Default settings
 execsite=local
 paramfile=Fast01
-ram=2000M
+ram=2048M
 dryrun=
 escapecode=$(printf '\033')
-fixed_params=2     # Currently CONSTANT, will want to have this vary
+variable_params=5     # Currently CONSTANT, will want to have this vary
 
 # Process command line arguments
 while [ $# -gt 0 ]; do
@@ -103,7 +103,7 @@
 echo
 
 # 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 * $fixed_params * $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 * $variable_params * $annealing_cycles * $evolve_reruns/$reruns_per_opt_invocation"`
 echo Total jobs = $total_jobs
 
 cd $rundir
@@ -128,7 +128,7 @@
 echo "Run dir=$rundir" >> ABOUT
 echo "Work dir=$WORK" >> ABOUT
 echo "Total jobs=$total_jobs" >> ABOUT
-echo "Run Command: SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf annealing.swift -e33="$escapecode" -minrange=$min_target_innovation -maxrange=$max_target_innovation-rangeinc=$target_innovation_increment -nreps=$annealing_repeats -annealingcycles=$annealing_cycles -evoreruns=$evolve_reruns -alphai=$alpha_i -alpham=$alpha_m -beta=$beta -gamma=$gamma -delta=$delta -nworkers=$nworkers -rerunsperapp=$reruns_per_opt_invocation " >> ABOUT
+echo "Run Command: SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $execsite.xml -config cf annealing.swift -minrange=$min_target_innovation -maxrange=$max_target_innovation-rangeinc=$target_innovation_increment -nreps=$annealing_repeats -annealingcycles=$annealing_cycles -evoreruns=$evolve_reruns -alphai=$alpha_i -alpham=$alpha_m -beta=$beta -gamma=$gamma -delta=$delta -nworkers=$nworkers -rerunsperapp=$reruns_per_opt_invocation -e33="$escapecode"" >> ABOUT
 
 if [ _$dryrun != _ ]; then
   exit 0
@@ -141,6 +141,7 @@
    runswift "$execsite.xml"
 fi
 
+# Run the convertbest.sh script on the generated txt files from within the rundir
 ../bin/convertbest.sh *.txt
 
 exit