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

Author: tomasnykodym

py/testdir_0xdata_only/test_DeepLearning_mnist.py

@@ -51,13 +51,13 @@ def test_DeepLearning_mnist(self):
             'activation'                   : 'RectifierWithDropout',
             'input_dropout_ratio'          : 0.2,
             'hidden'                       : '1024,1024,2048',
-            'adaptive_rate'                : 0,
+            'adaptive_rate'                : 1,
             'mini_batch'                   : 0, ## 0: better accuracy!  -1: best scalability!  10000: best accuracy?
-            'rate'                         : 0.01,
-            'rate_annealing'               : 1e-6,
-            'momentum_start'               : 0.5,
-            'momentum_ramp'                : 1800000,
-            'momentum_stable'              : 0.99,
+#            'rate'                         : 0.01,
+#            'rate_annealing'               : 1e-6,
+#            'momentum_start'               : 0.5,
+#            'momentum_ramp'                : 1800000,
+#            'momentum_stable'              : 0.99,
             'l1'                           : 1e-5,
             'l2'                           : 0.0,
             'seed'                         : 98037452452,

src/main/java/water/DTask.java

@@ -124,7 +124,8 @@ public boolean onExceptionalCompletion( Throwable ex, CountedCompleter caller )
   @Override public int frozenType() {throw barf("frozeType");}
   @Override public AutoBuffer writeJSONFields(AutoBuffer bb) { return bb; }
   @Override public water.api.DocGen.FieldDoc[] toDocField() { return null; }
-  public void copyOver(T that) {
+  public void copyOver(Freezable other) {
+    DTask that = (DTask)other;
     this._exception = that._exception;
     this._eFromNode = that._eFromNode;
     this._lineNum   = that._lineNum;

src/main/java/water/Weaver.java

@@ -9,7 +9,7 @@
 
 public class Weaver {
   private final ClassPool _pool;
-  private final CtClass _dtask, _iced, _enum;
+  private final CtClass _dtask, _iced, _enum, _freezable;
   private final CtClass[] _serBases;
   private final CtClass _fielddoc;
   private final CtClass _arg;
@@ -22,7 +22,8 @@ public class Weaver {
       _iced = _pool.get("water.Iced"); // Needs serialization
       _dtask= _pool.get("water.DTask");// Needs serialization and remote execution
       _enum = _pool.get("java.lang.Enum"); // Needs serialization
-      _serBases = new CtClass[] { _iced, _dtask, _enum, };
+      _freezable = _pool.get("water.Freezable"); // Needs serialization
+      _serBases = new CtClass[] { _iced, _dtask, _enum, _freezable };
       for( CtClass c : _serBases ) c.freeze();
       _fielddoc = _pool.get("water.api.DocGen$FieldDoc");// Is auto-documentation result
       _arg  = _pool.get("water.api.RequestArguments$Argument"); // Needs auto-documentation
@@ -74,6 +75,16 @@ private synchronized CtClass javassistLoadClass(String name) {
         if( cc.subclassOf(base) )
           return javassistLoadClass(cc);
 
+      // Subtype of an alternative freezable?
+      if( cc.subtypeOf( _freezable ) ) {
+        // Find the alternative freezable base
+        CtClass xcc = cc;
+        CtClass ycc = null;
+        while( xcc.subtypeOf(_freezable) ) { ycc = xcc; xcc = xcc.getSuperclass(); }
+        if( !ycc.isFrozen() ) ycc.freeze(); // Freeze the alternative base
+        return cc == ycc ? cc : javassistLoadClass(cc); // And weave the subclass
+      }
+
       return cc;
     } catch( NotFoundException nfe ) {
       return null;              // Not found?  Use the normal loader then
@@ -125,7 +136,8 @@ CtClass addSerializationMethods( CtClass cc ) throws CannotCompileException, Not
     if( cc.subclassOf(_enum) ) exposeRawEnumArray(cc);
     if( cc.subclassOf(_iced) ) ensureAPImethods(cc);
     if( cc.subclassOf(_iced) ||
-        cc.subclassOf(_dtask) ) {
+        cc.subclassOf(_dtask)||
+        cc.subtypeOf(_freezable)) {
       cc.setModifiers(javassist.Modifier.setPublic(cc.getModifiers()));
       ensureSerMethods(cc);
       ensureNullaryCtor(cc);
@@ -335,11 +347,11 @@ private void ensureSerMethods(CtClass cc) throws NotFoundException, CannotCompil
     boolean w = hasExisting("write", "(Lwater/AutoBuffer;)Lwater/AutoBuffer;", ccms);
     boolean r = hasExisting("read" , "(Lwater/AutoBuffer;)Lwater/Freezable;" , ccms);
     boolean d = cc.subclassOf(_dtask); // Subclass of DTask?
-    boolean c = hasExisting("copyOver" , "(Lwater/DTask;)V" , ccms);
+    boolean c = hasExisting("copyOver" , "(Lwater/Freezable;)V" , ccms);
     if( w && r && (!d || c) ) return;
     if( w || r || c )
       throw new RuntimeException(cc.getName() +" must implement all of " +
-      "read(AutoBuffer) and write(AutoBuffer) and copyOver(DTask) or none");
+      "read(AutoBuffer) and write(AutoBuffer) and copyOver(Freezable) or none");
 
     // Add the serialization methods: read, write.
     CtField ctfs[] = cc.getDeclaredFields();
@@ -396,7 +408,7 @@ private void ensureSerMethods(CtClass cc) throws NotFoundException, CannotCompil
     //       _d = s._d;
     //     }
     if( d ) make_body(cc,ctfs,callsuper,
-              "public void copyOver(water.DTask i) {\n"+
+              "public void copyOver(water.Freezable i) {\n"+
               "  "+cc.getName()+" s = ("+cc.getName()+")i;\n",
               "  super.copyOver(s);\n",
               "  %s = s.%s;\n",

src/main/java/water/exec/ASTRApply.java

@@ -364,7 +364,7 @@ else if( _gatherRows ) {
         _groups.put(ab.get(Group.class),new NewChunk(null,-99));
       return this;
     }
-    @Override public void copyOver( DTask dt ) {
+    @Override public void copyOver( Freezable dt ) {
       ddplyPass1 that = (ddplyPass1)dt;
       super.copyOver(that);
       this._gatherRows = that._gatherRows;

src/main/java/water/fvec/Vec.java

@@ -755,15 +755,15 @@ public CollectDomain(Vec v) { }
       return ab.putA8(_uniques==null ? null : _uniques.keySetLong());
     }
 
-    @Override public CollectDomain read( AutoBuffer ab ) {
+    @Override public Freezable read( AutoBuffer ab ) {
       super.read(ab);
       assert _uniques == null || _uniques.size()==0;
       long ls[] = ab.getA8();
       _uniques = new NonBlockingHashMapLong();
       if( ls != null ) for( long l : ls ) _uniques.put(l,"");
       return this;
     }
-    @Override public void copyOver(DTask that) {
+    @Override public void copyOver(Freezable that) {
       super.copyOver(that);
       _uniques = ((CollectDomain)that)._uniques;
     }

src/test/java/water/fvec/WordCountTest.java

@@ -117,7 +117,7 @@ private static int isChar( int b ) {
       System.out.println("WC Read takes "+t+"msec for "+cnt+" words");
       return this;
     }
-    @Override public void copyOver(DTask wc) { _words = ((WordCount)wc)._words; }
+    @Override public void copyOver(Freezable wc) { _words = ((WordCount)wc)._words; }
   }