[Swift-commit] r6131 - SwiftApps/SciColSim

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-01-04 14:01:38 -0600 (Fri, 04 Jan 2013)
New Revision: 6131

Modified:
   SwiftApps/SciColSim/testopt.py
Log:
Adjust time command for Mac OS X differences.

Modified: SwiftApps/SciColSim/testopt.py
===================================================================
--- SwiftApps/SciColSim/testopt.py	2013-01-04 01:16:18 UTC (rev 6130)
+++ SwiftApps/SciColSim/testopt.py	2013-01-04 20:01:38 UTC (rev 6131)
@@ -144,7 +144,7 @@
   incrTarget       = 134
   optimizerRepeats = 1
   evolveReruns     = 1
-  evolveReruns     = 240
+  evolveReruns     = 20
   annealingSteps   = 1
 
   alpha_i          = "0.0"
@@ -166,8 +166,8 @@
   gamma            = "0.0"
   delta            = "0.0"
 
+  NWorkers         = "2"
   openmp           = ""
-  NWorkers         = "24"
   openmp           = "OMP_NUM_THREADS=" + NWorkers
 
   operation        = "m"  # n=normal, m=manual (runs 1 multi_loss call)
@@ -186,12 +186,17 @@
   operation = ""
   seed = ""
 
+if sys.platform == "darwin":
+  timecmd = "/usr/bin/time "
+else:
+  timecmd = "/usr/bin/time -v "
+
 # Run the test
 
 for target in range(startTarget,endTarget,incrTarget):
   for i in range(optimizerRepeats):
     args = "rm -f bestdb.txt; " + \
-           openmp + " " + "/usr/bin/time -v " + app + " " + alpha_i + " " + alpha_m + " " + beta + " " + gamma + " " + delta + " " + str(target) + " 40000 20 " + str(evolveReruns) + \
+           openmp + " " + timecmd + app + " " + alpha_i + " " + alpha_m + " " + beta + " " + gamma + " " + delta + " " + str(target) + " 40000 20 " + str(evolveReruns) + \
            " 2 " + verboseLevel + " 2. 0.01 " + str(annealingSteps) + " 0.3 2.3 0 0 0 0 0 " + operation + " " + NWorkers + " " + seed \
            # + " >& out.T"+str(target)+".i"+str(i) + "; #mv bestdb.txt best.T" + str(target) + ".i" + str(i) 
     print("\n**** Calling optimizer: "+args+"\n")