Merge branch 'master' of https://github.com/0xdata/h2o

Richiexy · Oct 22, 2013 · c3b53c2 · c3b53c2
2 parents 73ec4fe + c043495
commit c3b53c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bench/BMscripts/glm2Bench.py b/bench/BMscripts/glm2Bench.py
@@ -90,7 +90,7 @@ def doGLM2(f, folderPath, family, lambda_, alpha, nfolds, y, x, testFilehex, row
         h2o.beta_features = True
         kwargs    = params.copy()
         glmStart  = time.time()
-        glm       = h2o_cmd.runGLM(parseResult = parseResult, noPoll=True, **kwargs)
+        glm       = h2o_cmd.runGLM(parseResult = parseResult, timeoutSecs=1800, noPoll=True, **kwargs)
         h2o_jobs.pollWaitJobs(timeoutSecs=7200, pollTimeoutSecs=7200, retryDelaySecs=5)
         glmTime   = time.time() - glmStart
         #glm       = h2o.nodes[0].inspect("GLM("+f+")")

diff --git a/bench/BMscripts/glmBench.py b/bench/BMscripts/glmBench.py
@@ -96,8 +96,9 @@ def doGLM(f, folderPath, family, link, lambda_, alpha, nfolds, y, x, testFilehex
                     })
 
         glmScoreStart = time.time()
-        glmScore      = h2o_cmd.runGLMScore(key       = testFilehex,
-                                            model_key = params['destination_key'])
+        glmScore      = h2o_cmd.runGLMScore(key         = testFilehex,
+                                            model_key   = params['destination_key'],
+                                            timeoutSecs = 1800)
         scoreTime     = time.time() - glmScoreStart
         if family == "binomial":
             row.update( {'scoreTime'          : scoreTime,