[Swift-commit] r5529 - SwiftApps/SciColSim

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2012-01-30 14:36:57 -0600 (Mon, 30 Jan 2012)
New Revision: 5529

Modified:
   SwiftApps/SciColSim/TODO
   SwiftApps/SciColSim/annealing.swift
Log:
Add TODO items for timings and stubed in FIXMEs for obtaining the timing data from the Swift code.

Modified: SwiftApps/SciColSim/TODO
===================================================================
--- SwiftApps/SciColSim/TODO	2012-01-30 20:25:34 UTC (rev 5528)
+++ SwiftApps/SciColSim/TODO	2012-01-30 20:36:57 UTC (rev 5529)
@@ -5,6 +5,7 @@
 
 [ ] Get timings for optimizer calls to display.  Perhaps via stdout or
     2nd file or a tagged value in the main output file of 'm' mode?
+    See FIXMEs inserted in the code for multi_loss for this.
 
 [ ] set optimizer to unbufferred IO
 
@@ -42,6 +43,7 @@
 [ ] Align Swift and .cpp code enough do a correctness test.
 
 [ ] 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++
     output). Why are we getting some long and some short? Is swift

Modified: SwiftApps/SciColSim/annealing.swift
===================================================================
--- SwiftApps/SciColSim/annealing.swift	2012-01-30 20:25:34 UTC (rev 5528)
+++ SwiftApps/SciColSim/annealing.swift	2012-01-30 20:36:57 UTC (rev 5529)
@@ -193,8 +193,10 @@
 }
 
 (Res r) multi_loss( int ci, int cj, float x[], float target_innov, int evolve_reruns )
+// (Res r, Stats s) multi_loss( int ci, int cj, float x[], float target_innov, int evolve_reruns ) FIXME: To obtain stats
 {
   file rfile[];
+  file ofile[]; // FIXME: to obtain timings and otehr stats
   tracef("multi_loss: entered: ci=%i cj=%i target_innov=%f evolve_reruns=%i x=%q\n",ci, cj, target_innov,evolve_reruns,x);
 
   int appCalls = @toint(@tofloat(evolve_reruns) / @tofloat(rerunsPerApp));  # FIXME: handle fractional issues and rounding etc. For now must divide evenly
@@ -224,12 +226,15 @@
 
     file graph <"movie_graph.txt">;
     (outfile, rfile[i]) = evolve(args,graph); 
+    // (ofile[i], rfile[i]) = evolve(args,graph); 
     tracef("multi_loss: i=%i calling evolve, args=%q\n", i, args);
     // tracef("multi_loss: after evolve: i=%i %k %k\n", i, outfile, rfile[i]);
   }
   file sumfile = sumloss(rfile);
   r = readData(sumfile);
   tracef("multi_loss: returning: ci=%i cj=%i r.loss=%f r.sdev=%f\n",ci,cj,r.loss,r.sdev);
+  // file statfile = sumstats(ofile);  FIXME: to obtain timings and otehr stats
+  // s = readStat(statsfile);          FIXME: to obtain timings and otehr stats
 }
 
 optimizer_sweep() // Implements logic of python driver script