Merge branch 'master' of https://github.com/h2oai/h2o-3

h2o-core/src/main/java/water/parser/SVMLightParser.java

@@ -3,8 +3,7 @@
 import java.io.*;
 import java.util.Arrays;
 
-import water.H2O;
-import water.exceptions.H2OParseException;
+import water.util.Log;
 import water.exceptions.H2OParseSetupException;
 import water.fvec.Vec;
 import water.util.PrettyPrint;
@@ -195,7 +194,7 @@ else if(exp != 0)
                     lstate = SKIP_LINE;
                   }
                 } else { // we're probably out of sync, skip the rest of the line
-                  dout.invalidLine("unexpected character after column id: " + c);
+                  dout.invalidLine("Unexpected character after column id: " + c);
                   lstate = SKIP_LINE;
                 }
                 break NEXT_CHAR;

h2o-docs/src/product/upgrade/Migration.md

@@ -623,9 +623,6 @@ H2O Classic | H2O 3.0  | Model Type
 `@model$mcc` | `@model$training_metrics$thresholds_and_metric_scores$absolute_MCC`  | `binomial`
 `@model$max_per_class_err` | currently replaced by `@model$training_metrics$thresholds_and_metric_scores$min_per_class_correct`  | `binomial`
 
-<!---
-
-##commenting out until repo is renamed - the information below will change
 
 ##Github Users
 
@@ -643,7 +640,7 @@ This is the easiest way to change your local repo and is recommended for most us
   origin	https://{[email protected]}/h2oai/h2o.git (fetch)
   origin	https://{[email protected]}/h2oai/h2o.git (push)
   ```
-0. Enter `git remote set-url origin {[email protected]}:h2oai/h2o-classic.git`, where `{[email protected]}` represents the address copied in the previous step. 
+0. Enter `git remote set-url origin {[email protected]}:h2oai/h2o-2.git`, where `{[email protected]}` represents the address copied in the previous step. 
 
 **The more complicated way**
 
@@ -657,8 +654,7 @@ This method involves editing the Github config file and should only be attempted
         url = https://[email protected]/h2oai/h2o.git
         fetch = +refs/heads/*:refs/remotes/origin/*
     ```
-0. In the `url =` line, change `h2o.git` to `h2o-classic.git`. 
+0. In the `url =` line, change `h2o.git` to `h2o-2.git`. 
 0. Save the changes.  
 
-
--->
+The latest version of H2O is stored in the `h2o-3` repository. All previous links to this repo will still work, but if you would like to manually update your Github configuration, follow the instructions above, replacing `h2o-2` with `h2o-3`. 

h2o-r/tests/testdir_jira/runit_NOPASS_pubdev_1140_nonspdmatrix_exception.R

@@ -0,0 +1,18 @@
+setwd(normalizePath(dirname(R.utils::commandArgs(asValues=TRUE)$"f")))
+source('../h2o-runit.R')
+
+test.glm.nonspdmatrix.exception <- function(conn)
+{
+  cars.hex <- h2o.uploadFile(conn, locate("smalldata/junit/cars.csv"))
+  cars.hex[,3] <- as.factor(cars.hex[,3])
+  c.sid <- h2o.runif(cars.hex)
+  cars.train <- h2o.assign(cars.hex[c.sid > .2, ], "cars.train")
+  cars.test <- h2o.assign(cars.hex[c.sid <= .2, ], "cars.test")
+
+  my.glm1 <- h2o.glm(x = 3:7, y = 2, training_frame = cars.train, family = "gamma", prior = 0.5, lambda_search = TRUE)
+  my.glm3 <- h2o.glm(x = 3:7, y = 2, training_frame = cars.train, family = "poisson", prior = 0.5, lambda_search = TRUE)
+
+  testEnd()
+}
+
+doTest("Testing GLM NonSPDMatrix Exception", test.glm.nonspdmatrix.exception)