no date update

Author: spennihana

bench/BMscripts/gbmBench.py

@@ -102,7 +102,7 @@ def doGBM(f, folderPath, ignored_cols, classification, testFilehex, ntrees, dept
         gbm       = h2o_cmd.runGBM(parseResult = parseResult, noPoll=True, timeoutSecs=4800, **kwargs)
         h2o_jobs.pollWaitJobs(timeoutSecs=16000, pollTimeoutSecs=120, retryDelaySecs=5)
         gbmTime   = time.time() - gbmStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         os.system(cmd)
         row.update( {'gbmBuildTime'       : gbmTime,
                     })

bench/BMscripts/glm2Bench.py

@@ -97,7 +97,7 @@ def doGLM2(f, folderPath, family, lambda_, alpha, nfolds, y, x, testFilehex, row
         glm       = h2o_cmd.runGLM(parseResult = parseResult, timeoutSecs=1800, noPoll=True, **kwargs)
         h2o_jobs.pollWaitJobs(timeoutSecs=7200, pollTimeoutSecs=7200, retryDelaySecs=5)
         glmTime   = time.time() - glmStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         os.system(cmd)
         #glm       = h2o.nodes[0].inspect("GLM("+f+")")
         row.update( {'glm2BuildTime'       : glmTime,

bench/BMscripts/glmBench.py

@@ -102,7 +102,7 @@ def doGLM(f, folderPath, family, link, lambda_, alpha, nfolds, y, x, testFilehex
                                             model_key   = params['destination_key'],
                                             timeoutSecs = 1800)
         scoreTime     = time.time() - glmScoreStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         os.system(cmd)
         if family == "binomial":
             row.update( {'scoreTime'          : scoreTime,

bench/BMscripts/kmeansBench.py

@@ -91,7 +91,7 @@ def doKMeans(f, folderPath):
                                             timeoutSecs=7200,
                                              **kwargs)
         kmeansTime      = time.time() - kmeansStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         os.system(cmd)
         row.update({'kmeansBuildTime' : kmeansTime})
         csvWrt.writerow(row)

bench/BMscripts/pcaBench.py

@@ -81,14 +81,14 @@ def doPCA(f, folderPath):
 
         kwargs              = params.copy()
         pcaStart            = time.time()
-        h2o.beta_features   = True
-        pcaResult = h2o_cmd.runPCA(parseResult = parseResult, noPoll = True
+        #h2o.beta_features   = True
+        pcaResult = h2o_cmd.runPCA(parseResult = parseResult, noPoll = True,
                                    timeoutSecs = 7200, 
                                    **kwargs)
 
         h2j.pollWaitJobs(timeoutSecs=4800, pollTimeoutSecs=4800, retryDelaySecs=2)
         pcaTime   = time.time() - pcaStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         #stop all loggers
         os.system(cmd)
         row.update({'pcaBuildTime' : pcaTime})

bench/BMscripts/summaryBench.py

@@ -79,7 +79,7 @@ def doSUM(f, folderPath):
                                        timeoutSecs = 7200)
 
         sumTime             = time.time() - sumStart
-        cmd = 'cd ..; bash startloggers.sh ' + json + ' stop_'
+        cmd = 'bash startloggers.sh ' + json + ' stop_'
         os.system(cmd)
         row.update({'summaryBuildTime' : sumTime})
         csvWrt.writerow(row)

bench/runBench.sh

@@ -7,6 +7,7 @@ h2oBuild=
 benchmarks="benchmarks"
 DATE=`date +%Y-%m-%d`
 archive="Archive"
+branchName="hilbert"
 
 function all {
     doAlgo summary;   wait;  makeDead 2> /dev/null;
@@ -122,6 +123,7 @@ JSON=
 BUILDN=
 DEBUG=0
 LOG=0
+DEEP=0
 while getopts "ht:j:b:dL" OPTION
 do
   case $OPTION in
@@ -228,3 +230,11 @@ rm pytest*flatfile*
 if [ -a nohup.out ]; then
     mv nohup.out ${archive}/${h2oBuild}-${DATE}-nohup.out
 fi
+wait
+
+bash createBench.sh ${branchName} ${JSON}
+
+
+
+
+

bench/startloggers.sh

@@ -75,9 +75,9 @@ function deepClean {
         echo "Melting ICES on machine $i"
         ssh 0xdiag@$i rm -rf /home/0xdiag/ice.55555* /home/0xdiag/*zip
         echo "Dumping any open instances of h2o..."
-        pids1=`echo ps -efww | grep h2o | grep spencer| grep jar|awk '{print $2}' | xargs`
+        pids1=`ps -efww | grep h2o | grep spencer| grep jar|awk '{print $2}' | xargs`
         ssh spencer@$i kill $pids1
-        pids2=`echo ps -efww | grep h2o | grep 0xdiag| grep jar|awk '{print $2}' | xargs`
+        pids2=`ps -efww | grep h2o | grep 0xdiag| grep jar|awk '{print $2}' | xargs`
         ssh spencer@$i kill $pids2
         echo "Shredding all logs on machine $i"
         ssh spencer@$i rm -rf /home/spencer/h2o/bench/BMLogs/starttime /home/spencer/h2o/bench/BMLogs/BigLogger* /home/spencer/h2o/bench/BMLogs/LittleLogger* /home/spencer/h2o/bench/BMLogs/rawLogs