[Swift-commit] r5688 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-26 13:13:12 -0600 (Sun, 26 Feb 2012)
New Revision: 5688

Modified:
   SwiftApps/SciColSim/TODO
   SwiftApps/SciColSim/swiftopt.sh
Log:
o minor updates to the TODO
o new logic to determine the next rundir added to swiftopt.sh



Modified: SwiftApps/SciColSim/TODO
===================================================================
--- SwiftApps/SciColSim/TODO	2012-02-26 19:02:23 UTC (rev 5687)
+++ SwiftApps/SciColSim/TODO	2012-02-26 19:13:12 UTC (rev 5688)
@@ -38,7 +38,7 @@
 
 [ ] Insert kill-and-restart logic to kill and re-run long running outliers.
 
-[ ] echo parameters at start like c++ logic
+[x] echo parameters at start like c++ logic
 
 [ ] Determine correct test parameter sets - and if we are passing these
     through correctly.
@@ -65,12 +65,12 @@
 
 [-] Make annealing.swift stdout/err output match that of optimizer.cpp
 
-[ ] Align Swift and .cpp code enough do a correctness test.
+[x] Align Swift and .cpp code enough do a correctness test.
 
-[ ] Double-check random number generation, and 100-# priming logic.
+[x] Double-check random number generation, and 100-# priming logic.
     Check on rand() vs random() and commented out RAND_MAX expressions.
 
-[ ] Enable precision control for %f formatting (to match c++
+[x] Enable precision control for %f formatting (to match c++
     output). Why are we getting some long and some short? Is swift
     truncating the constant or the tracef output?
 
@@ -88,7 +88,7 @@
 [ ] XSEDE
 [ ] OSG+XSEDE
 [ ] BG/P
-[ ] PADS
+[-] PADS
 [ ] FutureGrid
 [ ] OSG Cloud
 [ ] ibiCluster

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-26 19:02:23 UTC (rev 5687)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-26 19:13:12 UTC (rev 5688)
@@ -52,14 +52,8 @@
 done
 
 # Create next unique run id and run directory
-if [ ! -f nextrun ]; then
-  echo 000 >newrun
-else
-  cat nextrun | awk '{ printf("%03d\n", $1+1)}' >newrun
-fi
-runid=$(cat newrun 2> /dev/null)
-mv newrun nextrun 2> /dev/null
-rundir=run${runid}
+rundir=$( echo run??? | sed -e 's/^.*run//' | awk '{ printf("run%03d\n", $1+1)}' )
+
 #Exit if rundir already exits. Something is funky
 if [ -d $rundir ];
 then
@@ -79,7 +73,7 @@
 sed -e '/^[[:space:]]*\(#.*\)*$/d' -e 's/#.*//' -e 's/  */=/' -e 's/^/export /' <params/$paramfile >$rundir/params.annealing
 source $rundir/params.annealing
 swift=../swift/bin/swift # relative to runNNN/ dirs
-echo Optimization run $runid: site=$execsite paramfile=$paramfile
+echo Optimization $rundir: site=$execsite paramfile=$paramfile
 
 # Report an error if configuration files are missing
 if [ ! -f "conf/$execsite.xml" ] && [ ! -f "conf/$execsite.conf" ]; then