some fixes for the 164 jenkines va tests

narenreddy · Jan 31, 2014 · 42674fc · 42674fc
1 parent 20cace1
commit 42674fc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/py/h2o_glm.py b/py/h2o_glm.py
@@ -83,16 +83,22 @@ def simpleCheckGLMScore(self, glmScore, family='gaussian', allowFailWarning=Fals
         print "%15s %s" % ("auc:\t", validation['auc'])
         print "%15s %s" % ("threshold:\t", validation['threshold'])
 
+    err = False
     if family=="poisson" or family=="gaussian":
-        print "%15s %s" % ("aic:\t", validation['aic'])
+        if 'aic' not in validation:
+            print "aic is missing from the glm json response"
+            err = True
 
     if math.isnan(validation['err']):
-        emsg = "Why is this err = 'nan'?? %6s %s" % ("err:\t", validation['err'])
-        raise Exception(emsg)
+        print "Why is this err = 'nan'?? %6s %s" % ("err:\t", validation['err'])
+        err = True
 
     if math.isnan(validation['resDev']):
-        emsg = "Why is this resDev = 'nan'?? %6s %s" % ("resDev:\t", validation['resDev'])
-        raise Exception(emsg)
+        print "Why is this resDev = 'nan'?? %6s %s" % ("resDev:\t", validation['resDev'])
+        err = True
+
+    if err:
+        raise Exception ("How am I supposed to tell that any of these errors should be ignored?")
 
     # legal?
     if math.isnan(validation['nullDev']):

diff --git a/py/testdir_release/c2/test_c2_rel.py b/py/testdir_release/c2/test_c2_rel.py
@@ -73,7 +73,7 @@ def sub_c2_rel_long(self):
                     # remove the output too! (378)
                     ignore_x = []
                     # for i in [3,4,5,6,7,8,9,10,11,14,16,17,18,19,20,424,425,426,540,541]:
-                    for i in [3,4,5,6,7,8,9,10,11,14,16,17,18,19,20,424,425,426,540,541]:
+                    for i in [3,4,5,6,7,8,9,10,11,14,16,17,18,19,20,424,425,426,540,541,378]:
                         x.remove(i)
                         ignore_x.append(i)
 

diff --git a/py/testdir_release/c3/test_c3_rel.py b/py/testdir_release/c3/test_c3_rel.py
@@ -74,11 +74,12 @@ def sub_c3_rel_long(self):
                     x = range(542) # don't include the output column
                     # remove the output too! (378)
                     ignore_x = []
-                    for i in [3,4,5,6,7,8,9,10,11,14,16,17,18,19,20,424,425,426,540,541]:
+                    for i in [3,4,5,6,7,8,9,10,11,14,16,17,18,19,20,424,425,426,540,541,378]:
                         x.remove(i)
                         ignore_x.append(i)
 
-                    x = ",".join(map(lambda x: "C" + str(x), x))
+                    # have to the zero-based offset by 1 (h2o is one-based now)
+                    x = ",".join(map(lambda x: "C" + str(x), x+1))
                     ignore_x = ",".join(map(lambda x: "C" + str(x), ignore_x))
 
                     GLMkwargs = {

diff --git a/py/testdir_release/c4/test_c4_four_billion_rows.py b/py/testdir_release/c4/test_c4_four_billion_rows.py
@@ -68,8 +68,8 @@ def test_four_billion_rows(self):
                 'y': 'C' + str(1), 
                 'n_folds': 0, 
                 'family': 'binomial',
-                'case': '=', 
-                'case_val': 1
+                'case_mode': '=', 
+                'case': 1
             }
             # one coefficient is checked a little more
             colX = 0

diff --git a/py/testdir_release/c8/test_c8_rf_airlines_hdfs.py b/py/testdir_release/c8/test_c8_rf_airlines_hdfs.py
@@ -7,6 +7,7 @@
     'ntree': 5, 
     'depth': 15,
     'bin_limit': 100,
+    'use_non_local_data': False, # doesn't fit in single jvm
     'ignore': 'AirTime, ArrDelay, DepDelay, CarrierDelay, IsArrDelayed', 
     'timeoutSecs': 14800,
     'response_variable': 'IsDepDelayed'