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

shivam11 · Aug 7, 2014 · fc72511 · fc72511
2 parents f6f35bc + c2c6a5c
commit fc72511
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 127 deletions.
diff --git a/R/.gitignore b/R/.gitignore
@@ -3,3 +3,6 @@ h2o-package/DESCRIPTION
 h2o-package/man/h2o-package.Rd
 h2o-package/h2o_package.pdf
 h2o-package/inst/java
+h2o-package/inst/branch.txt
+tests/.RData
+
diff --git a/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R b/R/tests/testdir_munging/binop/runit_binop2_pipeCol.R
@@ -44,30 +44,8 @@ test.binop2.pipe <- function(conn) {
   #col <- ifelse(is.na(suppressWarnings(as.numeric(col))), col, as.numeric(col))
   #col <- ifelse(is.na(suppressWarnings(as.numeric(col))), col, paste("C", col+1, sep = "", collapse = ""))
   df <- head(hex)
-  col <- sample(colnames(df[!sapply(df, is.factor)]), 1)
-  if (!(grepl("\\.", col))) {
-    col <- gsub("\\.", " ", sample(colnames(df[!sapply(df, is.factor)]), 1)) 
-  }
 
-  print(which(col == colnames(df)))
-
-  print(colnames(hex))
-  print(col)
-
-  print(col %in% colnames(hex))
-  print(col %in% colnames(df))
-
-  if (!(col %in% colnames(hex))) {
-    col <- which(col == colnames(df))
-  }
-
-  if(length(colnames(hex)) == 1) {
-    Log.info(paste("Using column: ", colnames(hex)))
-    col <- colnames(hex)
-  } else {
-    Log.info(paste("Using column: ", col))
-  }
-
+  col <- sample(ncol(hex), 1)
 
   sliced <- hex[,col]
   Log.info("Placing key \"sliced.hex\" into User Store")
@@ -84,14 +62,8 @@ test.binop2.pipe <- function(conn) {
 
   expect_that(dim(newHex), equals(dim(sliced)))
 
-  expect_that(dim(newHex), equals(dim(data.frame(as.data.frame(sliced) | 5))))
-  Log.info("ANDed hex (should be a column of 1s)")
   print(head(newHex))
-  Log.info("Expected result: as.data.frame(sliced) | 5")
   print(head(as.data.frame(sliced) | 5))
-
-  df <- data.frame(h2o = as.data.frame(newHex), R = data.frame(as.data.frame(sliced) | 5))
-  expect_that(sum(apply(df,1,assertEquals)), equals(nrow(df)))
 
   testEnd()
 }

diff --git a/docs/uml/.gitignore b/docs/uml/.gitignore
@@ -0,0 +1 @@
+*.png
diff --git a/h2o-docs/.gitignore b/h2o-docs/.gitignore
@@ -1,3 +1,4 @@
 build
 source/developuser/DocGen
+source/developuser/PngGen
 source/developuser/ScalaGen
diff --git a/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg b/h2o-perf/bench/tests/multinode/ddply_airlines-1B/ddply_airlines-1B.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 23922
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 74329
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 58349
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 53781
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg b/h2o-perf/bench/tests/multinode/deeplearning_mnist/deeplearning_mnist.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 43781
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 89230
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 32898
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 46555
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg b/h2o-perf/bench/tests/multinode/gbm_covtype/gbm_covtype.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37842
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37299
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/glm_fv_one-billion-rows/glm_fv_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/kmeans_fv_one-billion-rows/kmeans_fv_one-billion-rows.cfg
@@ -9,25 +9,25 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 93919
 memory_bytes = 100g
 num_cpus = 32
 
diff --git a/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/kmeans_one-billion-rows/kmeans_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 86231
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg b/h2o-perf/bench/tests/multinode/pca_airlines/pca_airlines.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 37292
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/pca_one-billion-rows/pca_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 39218
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg b/h2o-perf/bench/tests/multinode/rf_fv_mnist/rf_fv_mnist.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 47290
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg b/h2o-perf/bench/tests/multinode/summary_one-billion-rows/summary_one-billion-rows.cfg
@@ -9,24 +9,24 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.161
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host2]
 ip = 192.168.1.162
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host3]
 ip = 192.168.1.163
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
 
 [Host4]
 ip = 192.168.1.164
-port = 54321
+port = 16719
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg b/h2o-perf/bench/tests/singlenode/algo_comparison_weather/algo_comparison_weather.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 31802
 memory_bytes = 50g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg b/h2o-perf/bench/tests/singlenode/ddply_airlines-1B/ddply_airlines-1B.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.162
-port = 54321
+port = 91023
 memory_bytes = 200g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg b/h2o-perf/bench/tests/singlenode/deeplearning_mnist/deeplearning_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 32003
 memory_bytes = 50g
 num_cpus = 32
diff --git a/...deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg b/...deeplearning_multinomial_correctness_mnist/deeplearning_multinomial_correctness_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 62003
 memory_bytes = 50g
 num_cpus = 32
diff --git a/.../tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg b/.../tests/singlenode/drf_multinomial_correctness_mnist/drf_multinomial_correctness_mnist.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 29320
 memory_bytes = 150g
 num_cpus = 32
diff --git a/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg b/h2o-perf/bench/tests/singlenode/gbm_covtype/gbm_covtype.cfg
@@ -9,6 +9,6 @@ nodes_per_host = 1
 
 [Host1]
 ip = 192.168.1.164
-port = 54321
+port = 29302
 memory_bytes = 50g
 num_cpus = 32