timeout change, small touch up to packaging index, and fixes to the b…

…enchmarks
obisu · Oct 31, 2013 · 95bb8e4 · 95bb8e4
1 parent ec5e11a
commit 95bb8e4
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 34 deletions.
diff --git a/bench/BMscripts/gbmBench.py b/bench/BMscripts/gbmBench.py
@@ -19,11 +19,11 @@ def doGBM(f, folderPath, ignored_cols, classification, testFilehex, ntrees, dept
     if debug:
         print "Doing GBM DEBUG"
         bench = "bench/debug"
-    date = '-'.join([str(x) for x in list(time.localtime())][0:3])
+    #date = '-'.join([str(x) for x in list(time.localtime())][0:3])
     overallWallStart = time.time()
     pre = ""
     if debug: pre    = 'DEBUG'
-    gbmbenchcsv = 'benchmarks/'+build+'/'+date+'/'+pre+'gbmbench.csv'
+    gbmbenchcsv = 'benchmarks/'+build+'/'+pre+'gbmbench.csv'
     if not os.path.exists(gbmbenchcsv):
         output = open(gbmbenchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/BMscripts/glm2Bench.py b/bench/BMscripts/glm2Bench.py
@@ -23,7 +23,7 @@ def doGLM2(f, folderPath, family, lambda_, alpha, nfolds, y, x, testFilehex, row
     overallWallStart  = time.time()
     pre               = ""
     if debug: pre     = "DEBUG"
-    glm2benchcsv      = 'benchmarks/'+build+'/'+date+'/'+pre+'glm2bench.csv'
+    glm2benchcsv      = 'benchmarks/'+build+'/'+pre+'glm2bench.csv'
     if not os.path.exists(glm2benchcsv):
         output = open(glm2benchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/BMscripts/glmBench.py b/bench/BMscripts/glmBench.py
@@ -22,7 +22,7 @@ def doGLM(f, folderPath, family, link, lambda_, alpha, nfolds, y, x, testFilehex
     overallWallStart = time.time()
     pre              = ""
     if debug: pre    = "DEBUG"
-    glmbenchcsv      = 'benchmarks/'+build+'/'+date+'/'+pre+'glmbench.csv'
+    glmbenchcsv      = 'benchmarks/'+build+'/'+pre+'glmbench.csv'
     if not os.path.exists(glmbenchcsv):
         output = open(glmbenchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/BMscripts/kmeansBench.py b/bench/BMscripts/kmeansBench.py
@@ -18,11 +18,11 @@ def doKMeans(f, folderPath):
     if debug:
         print "Debugging KMEANS"
         bench = "bench/debug"
-    date = '-'.join([str(x) for x in list(time.localtime())][0:3])
+    #date = '-'.join([str(x) for x in list(time.localtime())][0:3])
     overallWallStart = time.time()
     pre = ""
     if debug: pre    = "DEBUG"
-    kmeansbenchcsv   = 'benchmarks/'+build+'/'+date+'/'+pre+'kmeansbench.csv'
+    kmeansbenchcsv   = 'benchmarks/'+build+'/'+pre+'kmeansbench.csv'
     if not os.path.exists(kmeansbenchcsv):
         output       = open(kmeansbenchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/BMscripts/pcaBench.py b/bench/BMscripts/pcaBench.py
@@ -19,12 +19,12 @@ def doPCA(f, folderPath):
     if debug:
         print "Doing PCA DEBUG"
         bench = "bench/debug"
-    date = '-'.join([str(x) for x in list(time.localtime())][0:3])
+    #date = '-'.join([str(x) for x in list(time.localtime())][0:3])
     retryDelaySecs = 5 #if f == 'AirlinesTrain1x' else 30
     overallWallStart = time.time()
     pre = ""
     if debug: pre    = 'DEBUG'
-    pcabenchcsv      = 'benchmarks/'+build+'/'+date+'/'+pre+'pcabench.csv'
+    pcabenchcsv      = 'benchmarks/'+build+'/'+pre+'pcabench.csv'
     if not os.path.exists(pcabenchcsv):
         output = open(pcabenchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/BMscripts/summaryBench.py b/bench/BMscripts/summaryBench.py
@@ -19,12 +19,12 @@ def doSUM(f, folderPath):
     if debug:
         print "Doing SUM DEBUG"
         bench = "bench/debug"
-    date = '-'.join([str(x) for x in list(time.localtime())][0:3])
+    #date = '-'.join([str(x) for x in list(time.localtime())][0:3])
     retryDelaySecs = 5 #if f == 'AirlinesTrain1x' else 30
     overallWallStart = time.time()
     pre = ""
     if debug: pre    = 'DEBUG'
-    sumbenchcsv      = 'benchmarks/'+build+'/'+date+'/'+pre+'summarybench.csv'
+    sumbenchcsv      = 'benchmarks/'+build+'/'+pre+'summarybench.csv'
     if not os.path.exists(sumbenchcsv):
         output = open(sumbenchcsv,'w')
         output.write(','.join(csv_header)+'\n')

diff --git a/bench/runBench.sh b/bench/runBench.sh
@@ -177,8 +177,8 @@ then
 fi
 h2oBuild=`cat latest`
 
-if [ ! -d ${benchmarks}/${h2oBuild}/${DATE} ]; then
-  mkdir -p ${benchmarks}/${h2oBuild}/${DATE}
+if [ ! -d ${benchmarks}/${h2oBuild} ]; then
+  mkdir -p ${benchmarks}/${h2oBuild}
 fi
 
 if [ $DEEP -eq 1 ]

diff --git a/packaging/index.html b/packaging/index.html
@@ -3,23 +3,22 @@
 <!--This file belongs in the final build output directory living on S3.-->
 <html>
 <head>
-    <script>
-        function load(id) {
-            //var res = "SUBST_PROJECT_VERSION".split(".");
-            //resource = "./".concat(res[res.length-1]).concat("/").concat(
-            resource = id.concat("/").concat(id).concat(".html");
-            r = new XMLHttpRequest();
-            r.open("HEAD", resource, true);
-            r.send(null);
-            r.onreadystatechange = function () {
-                if(r.readyState === 4) {
-                    var d = document.getElementById(id)
-                    if(r.status === 200) d.style.display = "inline"
-                    return
-                }
-            }
+  <script>
+    function load(id) {
+      //var res = "SUBST_PROJECT_VERSION".split(".");
+      //resource = "./".concat(res[res.length-1]).concat("/").concat(
+      resource = id.concat("/").concat(id).concat(".html");
+      r = new XMLHttpRequest();
+      r.open("HEAD", resource, true);
+      r.send(null);
+      r.onreadystatechange = function () {
+        if(r.readyState === 4) {
+          var d = document.getElementById(id);
+          if(r.status === 200) d.style.display = "inline";
         }
-    </script>
+      }
+    }
+  </script>
 </head>
 
 <body>
@@ -149,9 +148,9 @@ <h2 align="center">
 </div>
 
 <script>
-    load("bench")
-    load("test")
+    load("bench");
+    load("test");
 </script>
 
 </body>
-<html>
+</html>
diff --git a/py/testdir_multi_jvm/test_NN_covtype_1.py b/py/testdir_multi_jvm/test_NN_covtype_1.py
@@ -33,8 +33,7 @@ def test_NN_covtype_1(self):
 
         response = 54
         kwargs = {
-            # this is ignore??
-            'cols': x, # apparently required? 
+            'ignored_cols': None, #not required
             'response': response,
             'activation': 'Tanh',
             'hidden': 500,

diff --git a/src/main/java/water/api/RequestBuilders.java b/src/main/java/water/api/RequestBuilders.java
@@ -175,7 +175,7 @@ protected String buildResponseHeader(Response response) {
           result.replace("JSSTUFF", poll.toString());
         } else {
           RString poll = new RString(_pollJs);
-          poll.replace("TIMEOUT", response._pollProgress==0 ? 500 : 2000);
+          poll.replace("TIMEOUT", response._pollProgress==0 ? 1500 : 2000);
           result.replace("JSSTUFF", poll.toString());
         }
         int pct = (int) ((double)response._pollProgress / response._pollProgressElements * 100);