added OpDef for Operation

Oceania2018 · Oceania2018 · commit ff8f72a38e4b · 2018-12-16T20:29:55.000-06:00
diff --git a/src/TensorFlowNET.Core/Graph.cs b/src/TensorFlowNET.Core/Graph.cs
@@ -41,10 +41,13 @@ public unsafe Operation create_op(string op_type, object inputs, TF_DataType[] d
                 name = op_type;
             }
 
-            name = unique_name(name);
+            name = name.EndsWith("/") ? ops._name_from_scope_name(name) : unique_name(name);
             var node_def = ops._NodeDef(op_type, name, device: "", attrs: attrs);
 
-            var op = new Operation(node_def, this, inputs, dtypes);
+            var op = new Operation(node_def, this,
+                inputs: inputs,
+                output_types: dtypes,
+                op_def: op_def);
 
             return op;
         }
diff --git a/src/TensorFlowNET.Core/OpDefLibrary.cs b/src/TensorFlowNET.Core/OpDefLibrary.cs
@@ -86,8 +86,8 @@ public unsafe Operation _apply_op_helper(string op_type_name, string name = "",
             var op = g.create_op(op_type_name, null, output_types.ToArray(),
                 name: "Placeholder_1/",
                 input_types: new DataType[] { },
-                attrs: null,
-                op_def: null);
+                attrs: attr_protos,
+                op_def: op_def);
 
             return op;
         }
diff --git a/src/TensorFlowNET.Core/Operation.cs b/src/TensorFlowNET.Core/Operation.cs
@@ -15,8 +15,9 @@ public class Operation
         public string name;
         private Tensor[] _outputs;
         public Tensor[] outputs => _outputs;
+        public Tensor[] inputs;
 
-        public Operation(NodeDef node_def, Graph g, object inputs = null, TF_DataType[] output_types = null, object control_inputs = null, TF_DataType[] input_types = null, string original_op = "", string op_def = "")
+        public Operation(NodeDef node_def, Graph g, object inputs = null, TF_DataType[] output_types = null, object control_inputs = null, TF_DataType[] input_types = null, string original_op = "", OpDef op_def = null)
         {
             _graph = g;
 
@@ -32,5 +33,24 @@ public Operation(NodeDef node_def, Graph g, object inputs = null, TF_DataType[]
 
             _graph._add_op(this);
         }
+
+        public object get_attr(string name)
+        {
+            object ret = null;
+
+            var fields = new string[] { "s", "i", "f", "b", "type", "shape", "tensor", "func" };
+
+            switch (name)
+            {
+                case "dtype":
+                    ret = _outputs[0];
+                    break;
+                case "shape":
+                    ret = new TensorShapeProto();
+                    break;
+            }
+
+            return ret;
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/gen_array_ops.cs b/src/TensorFlowNET.Core/gen_array_ops.cs
@@ -12,7 +12,13 @@ public static class gen_array_ops
 
         public static Tensor placeholder(DataType dtype, TensorShape shape = null)
         {
-            var op = _op_def_lib._apply_op_helper("Placeholder", dtype: dtype, shape: shape);
+            var _op = _op_def_lib._apply_op_helper("Placeholder", dtype: dtype, shape: shape);
+            var _result = _op.outputs;
+            var _inputs_flat = _op.inputs;
+            var _attrs = new Dictionary<string, object>();
+
+            _attrs["dtype"] = _op.get_attr("dtype");
+            _attrs["shape"] = _op.get_attr("shape");
 
             return null;
         }
diff --git a/src/TensorFlowNET.Core/ops.cs b/src/TensorFlowNET.Core/ops.cs
@@ -49,6 +49,18 @@ public static NodeDef _NodeDef(string op_type, string name, string device = "",
             return node_def;
         }
 
+        public static string _name_from_scope_name(string name)
+        {
+            if (name.EndsWith("/"))
+            {
+                return name.Substring(0, name.Length - 1);
+            }
+            else
+            {
+                return name;
+            }
+        }
+
         public static int uid()
         {
             return 1;

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,13 @@ public unsafe Operation create_op(string op_type, object inputs, TF_DataType[] d`
`41`	`41`	`name = op_type;`
`42`	`42`	`}`
`43`	`43`
`44`		`- name = unique_name(name);`
	`44`	`+ name = name.EndsWith("/") ? ops._name_from_scope_name(name) : unique_name(name);`
`45`	`45`	`var node_def = ops._NodeDef(op_type, name, device: "", attrs: attrs);`
`46`	`46`
`47`		`- var op = new Operation(node_def, this, inputs, dtypes);`
	`47`	`+ var op = new Operation(node_def, this,`
	`48`	`+ inputs: inputs,`
	`49`	`+ output_types: dtypes,`
	`50`	`+ op_def: op_def);`
`48`	`51`
`49`	`52`	`return op;`
`50`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,13 @@ public static class gen_array_ops`
`12`	`12`
`13`	`13`	`public static Tensor placeholder(DataType dtype, TensorShape shape = null)`
`14`	`14`	`{`
`15`		`- var op = _op_def_lib._apply_op_helper("Placeholder", dtype: dtype, shape: shape);`
	`15`	`+ var _op = _op_def_lib._apply_op_helper("Placeholder", dtype: dtype, shape: shape);`
	`16`	`+ var _result = _op.outputs;`
	`17`	`+ var _inputs_flat = _op.inputs;`
	`18`	`+ var _attrs = new Dictionary<string, object>();`
	`19`	`+`
	`20`	`+ _attrs["dtype"] = _op.get_attr("dtype");`
	`21`	`+ _attrs["shape"] = _op.get_attr("shape");`
`16`	`22`
`17`	`23`	`return null;`
`18`	`24`	`}`