Merge remote-tracking branch 'origin/nn5'

Conflicts: hadoop/Makefile
David5L · Nov 13, 2013 · a5b0f87 · a5b0f87
2 parents 13392c6 + fcceebb
commit a5b0f87
Show file tree

Hide file tree

Showing 10 changed files with 425 additions and 288 deletions.
diff --git a/experiments/src/main/java/hex/Histogram.java b/experiments/src/main/java/hex/Histogram.java
@@ -1,6 +1,5 @@
 package hex;
 
-import hex.Histogram;
 import hex.Layer;
 
 import java.util.ArrayList;
@@ -58,26 +57,11 @@ public static void build(final Layer[] ls) {
         VBox v = new VBox();
         for( int i = ls.length - 1; i > 0; i-- ) {
           HBox h = new HBox();
-          h.getChildren().add(new Histogram("Layer " + i + " A", ls[i]._a));
-          h.getChildren().add(new Histogram("E", ls[i]._e));
-          v.getChildren().add(h);
-
-          h = new HBox();
           h.getChildren().add(new Histogram("Layer " + i + " W", ls[i]._w));
           h.getChildren().add(new Histogram("B", ls[i]._b));
+          h.getChildren().add(new Histogram("A", ls[i]._a));
+          h.getChildren().add(new Histogram("E", ls[i]._e));
           v.getChildren().add(h);
-
-          h = new HBox();
-          h.getChildren().add(new Histogram("Layer " + i + " W S", ls[i]._wSpeed));
-          h.getChildren().add(new Histogram("W B", ls[i]._bSpeed));
-          v.getChildren().add(h);
-
-          if( ls[i]._v != null ) {
-            h = new HBox();
-            h.getChildren().add(new Histogram("Layer " + i + " V", ls[i]._v));
-            h.getChildren().add(new Histogram("Gradient " + i + " V", ls[i]._gv));
-            v.getChildren().add(h);
-          }
         }
         Stage stage = new Stage();
         BorderPane root = new BorderPane();
@@ -105,8 +89,8 @@ public void changed(ObservableValue<? extends Boolean> ov, Boolean old_val, Bool
         root.setCenter(scroll);
         Scene scene = new Scene(root);
         stage.setScene(scene);
-        stage.setWidth(1500);
-        stage.setHeight(1100);
+        stage.setWidth(2450);
+        stage.setHeight(1500);
         stage.show();
 
         scene.getWindow().onCloseRequestProperty().addListener(new ChangeListener() {

diff --git a/h2o-samples/.gitignore b/h2o-samples/.gitignore
@@ -0,0 +1 @@
+/AwsCredentials.properties
diff --git a/h2o-samples/src/main/java/samples/MapReduce.java b/h2o-samples/src/main/java/samples/MapReduce.java
@@ -16,7 +16,7 @@ public static void main(String[] args) throws Exception {
     samples.launchers.CloudLocal.launch(1, MapReduce.class);
     // samples.launchers.CloudProcess.launch(2, MapReduce.class);
     // samples.launchers.CloudConnect.launch("localhost:54321", MapReduce.class);
-    // samples.launchers.CloudRemote.launchIPs(MapReduce.class);
+    // samples.launchers.CloudRemote.launchDefaultIPs(MapReduce.class);
   }
 
   @Override protected void exec() {

diff --git a/h2o-samples/src/main/java/samples/NeuralNetMnist.java b/h2o-samples/src/main/java/samples/NeuralNetMnist.java
@@ -21,10 +21,11 @@
  */
 public class NeuralNetMnist extends Job {
   public static void main(String[] args) throws Exception {
-    samples.launchers.CloudLocal.launch(1, NeuralNetMnist.class);
+    // samples.launchers.CloudLocal.launch(1, NeuralNetMnist.class);
     // samples.launchers.CloudProcess.launch(4, NeuralNetMnist.class);
-    // samples.launchers.CloudRemote.launchIPs(NeuralNetMnist.class);
+    // samples.launchers.CloudRemote.launchDefaultIPs(NeuralNetMnist.class);
     // samples.launchers.CloudConnect.launch("localhost:54321", NeuralNetMnist.class);
+    samples.launchers.CloudRemote.launchEC2(NeuralNetMnist.class);
   }
 
   protected Vec[] train, test;
@@ -40,19 +41,18 @@ protected Layer[] build(Vec[] data, Vec labels, VecsInput inputStats, VecSoftmax
     ls[0] = new VecsInput(data, inputStats);
     ls[1] = new Tanh(500);
     ls[2] = new VecSoftmax(labels, outputStats);
-    ls[1].rate = .05f;
-    ls[2].rate = .02f;
     for( int i = 0; i < ls.length; i++ ) {
-      ls[i].l2 = .0001f;
-      ls[i].rate_annealing = 1 / 2e6f;
+      ls[i].rate = .005f;
+      ls[i].rate_annealing = 1 / 1e6f;
+      ls[i].l2 = .001f;
       ls[i].init(ls, i);
     }
     return ls;
   }
 
   protected Trainer startTraining(Layer[] ls) {
     Trainer trainer = new Trainer.MapReduce(ls, 0, self());
-    //Trainer trainer = new Trainer.Direct(ls);
+    // Trainer trainer = new Trainer.Direct(ls, self());
     trainer.start();
     return trainer;
   }

diff --git a/h2o-samples/src/main/java/samples/NeuralNetMnistDeep.java b/h2o-samples/src/main/java/samples/NeuralNetMnistDeep.java
diff --git a/h2o-samples/src/main/java/samples/launchers/CloudRemote.java b/h2o-samples/src/main/java/samples/launchers/CloudRemote.java
@@ -1,5 +1,7 @@
 package samples.launchers;
 
+import java.util.Arrays;
+
 import water.Job;
 import water.deploy.*;
 import water.util.Log;
@@ -12,8 +14,8 @@
  */
 public class CloudRemote {
   public static void main(String[] args) throws Exception {
-    // launchEC2(null);
-    launchIPs(null);
+    launchEC2(null);
+    // launchDefaultIPs(null);
   }
 
   /**
@@ -26,16 +28,21 @@ public static void launchEC2(Class<? extends Job> job) throws Exception {
     launch(c, job);
   }
 
+  public static void launchDefaultIPs(Class<? extends Job> job) throws Exception {
+    launchIPs(job, //
+        "192.168.1.161", //
+        "192.168.1.162", //
+        "192.168.1.163", //
+        "192.168.1.164");
+  }
+
   /**
    * The current user is assumed to have ssh access (key-pair, no password) to the remote machines.
    * H2O will be deployed to '~/h2o_rsync/'.
    */
-  public static void launchIPs(Class<? extends Job> job) throws Exception {
+  public static void launchIPs(Class<? extends Job> job, String... ips) throws Exception {
     Cloud cloud = new Cloud();
-    cloud.publicIPs.add("192.168.1.161");
-    cloud.publicIPs.add("192.168.1.162");
-    cloud.publicIPs.add("192.168.1.163");
-    cloud.publicIPs.add("192.168.1.164");
+    cloud.publicIPs.addAll(Arrays.asList(ips));
     launch(cloud, job);
   }