Merge pull request #579 from joker-star-l/tf_demo

ConvLSTM demo

Author: zkaoudi

wayang-api/wayang-api-json/src/main/scala/operatorfromjson/binary/DLTrainingOperatorFromJson.scala

@@ -43,7 +43,7 @@ case class Op(val op: String, val opType: String, val dType: String, val fromLis
       case "Cast" => new Cast(parseDType(dType))
       case "CrossEntropyLoss" => new CrossEntropyLoss(labels)
       case "Eq" => new Eq()
-      case "Input" => new Input(parseInputType(opType))
+      case "Input" => new Input(null, parseInputType(opType))
       case "Mean" => new Mean(dim)
       case "Linear" => new Linear(inFeatures, outFeatures, bias)
       case "ReLU" => new ReLU()
@@ -74,7 +74,6 @@ case class Op(val op: String, val opType: String, val dType: String, val fromLis
     inputType match {
       case "..FEATURES.." => Input.Type.FEATURES
       case "..LABEL.." => Input.Type.LABEL
-      case "..PREDICTED.." => Input.Type.PREDICTED
     }
   }
 }

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/DLModel.java

@@ -30,4 +30,26 @@ public DLModel(Op out) {
     public Op getOut() {
         return out;
     }
+
+    public static class Builder {
+        private Op out;
+
+        public DLModel build() {
+            return new DLModel(out);
+        }
+
+        public Builder layer(Op op) {
+            if (op == null) {
+                return this;
+            }
+
+            if (out == null) {
+                out = op;
+            } else {
+                out = op.with(out);
+            }
+
+            return this;
+        }
+    }
 }

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Get.java

@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wayang.basic.model.op;
+
+public class Get extends Op {
+    // currently, only support String
+    private final Object key;
+
+    public Get(Object key) {
+        this(key, null, DType.FLOAT32);
+    }
+
+    public Get(Object key, DType dType) {
+        this(key, null, dType);
+    }
+
+    public Get(Object key, String name) {
+        this(key, name, DType.FLOAT32);
+    }
+
+    public Get(Object key, String name, DType dType) {
+        super(name, dType);
+        this.key = key;
+    }
+
+    public Object getKey() {
+        return key;
+    }
+
+    @Override
+    public int inputsRequired() {
+        return 1;
+    }
+}

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Input.java

@@ -19,40 +19,45 @@
 package org.apache.wayang.basic.model.op;
 
 public class Input extends Op {
+    private final int[] shape;
 
-    public Input() {
-        this(DType.FLOAT32);
+    public Input(int[] shape) {
+        this(shape, DType.FLOAT32);
     }
 
-    public Input(String name) {
-        this(name, DType.FLOAT32);
+    public Input(int[] shape, String name) {
+        this(shape, name, DType.FLOAT32);
     }
 
-    public Input(Type type) {
-        this(type.getName(), DType.FLOAT32);
+    public Input(int[] shape, Type type) {
+        this(shape, type.getName(), DType.FLOAT32);
     }
 
-    public Input(DType dType) {
-        super(dType);
+    public Input(int[] shape, DType dType) {
+        this(shape, (String) null, dType);
     }
 
-    public Input(String name, DType dType) {
-        super(name, dType);
+    public Input(int[] shape, Type type, DType dType) {
+        this(shape, type.getName(), dType);
     }
 
-    public Input(Type type, DType dType) {
-        super(type.getName(), dType);
+    public Input(int[] shape, String name, DType dType) {
+        super(name, dType);
+        this.shape = shape;
     }
 
     @Override
     public int inputsRequired() {
         return 0;
     }
 
+    public int[] getShape() {
+        return shape;
+    }
+
     public enum Type {
         FEATURES("..FEATURES.."),
-        LABEL("..LABEL.."),
-        PREDICTED("..PREDICTED..");
+        LABEL("..LABEL..");
 
         private final String name;
 

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Op.java

@@ -25,26 +25,35 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class Op implements Serializable {
+    private static final AtomicInteger ID_GENERATOR = new AtomicInteger(0);
     private static final AtomicInteger CNT = new AtomicInteger(0);
 
+    protected final int id;
     protected final String name;
     protected final List<Op> fromList;
 
     // output type
     protected final DType dType;
 
     public Op(DType dType) {
-        this.name = this.getClass().getSimpleName() + CNT.getAndIncrement();
-        this.fromList = new ArrayList<>();
-        this.dType = dType;
+        this(null, dType);
     }
 
     public Op(String name, DType dType) {
-        this.name = name;
+        this.id = ID_GENERATOR.getAndIncrement();
+        if (name == null || name.isEmpty()) {
+            this.name = this.getClass().getSimpleName() + CNT.getAndIncrement();
+        } else {
+            this.name = name;
+        }
         this.fromList = new ArrayList<>();
         this.dType = dType;
     }
 
+    public int getId() {
+        return id;
+    }
+
     public String getName() {
         return name;
     }

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Reshape.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wayang.basic.model.op;
+
+public class Reshape extends Op {
+    private final int[] shape;
+
+    public Reshape(int[] shape) {
+        this(shape, null, DType.FLOAT32);
+    }
+
+    public Reshape(int[] shape, DType dType) {
+        this(shape, null, dType);
+    }
+
+    public Reshape(int[] shape, String name) {
+        this(shape, name, DType.FLOAT32);
+    }
+
+    public Reshape(int[] shape, String name, DType dType) {
+        super(name, dType);
+        this.shape = shape;
+    }
+
+    public int[] getShape() {
+        return shape;
+    }
+
+    @Override
+    public int inputsRequired() {
+        return 1;
+    }
+}

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Slice.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wayang.basic.model.op;
+
+public class Slice extends Op {
+    private final int[][] range; // int[dim][2]
+
+    public Slice(int[][] range) {
+        this(range, null, DType.FLOAT32);
+    }
+
+    public Slice(int[][] range, DType dType) {
+        this(range, null, dType);
+    }
+
+    public Slice(int[][] range, String name) {
+        this(range, name, DType.FLOAT32);
+    }
+
+    public Slice(int[][] range, String name, DType dType) {
+        super(name, dType);
+        this.range = range;
+    }
+
+    public int[][] getRange() {
+        return range;
+    }
+
+    @Override
+    public int inputsRequired() {
+        return 1;
+    }
+}

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/Transpose.java

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wayang.basic.model.op;
+
+public class Transpose extends Op {
+    private final int[] perm;
+
+    public Transpose(int[] perm) {
+        this(perm, null, DType.FLOAT32);
+    }
+
+    public Transpose(int[] perm, DType dType) {
+        this(perm, null, dType);
+    }
+
+    public Transpose(int[] perm, String name) {
+        this(perm, name, DType.FLOAT32);
+    }
+
+    public Transpose(int[] perm, String name, DType dType) {
+        super(name, dType);
+        this.perm = perm;
+    }
+
+    public int[] getPerm() {
+        return perm;
+    }
+
+    @Override
+    public int inputsRequired() {
+        return 1;
+    }
+}

wayang-commons/wayang-basic/src/main/java/org/apache/wayang/basic/model/op/ZeroLike.java

@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.wayang.basic.model.op;
+
+public class ZeroLike extends Op {
+
+    public ZeroLike() {
+        this(null, DType.FLOAT32);
+    }
+
+    public ZeroLike(DType dType) {
+        this(null, dType);
+    }
+
+    public ZeroLike(String name) {
+        this(name, DType.FLOAT32);
+    }
+
+    public ZeroLike(String name, DType dType) {
+        super(name, dType);
+    }
+
+    @Override
+    public int inputsRequired() {
+        return 1;
+    }
+}