node_def property in Operation #134

Oceania2018 · Oceania2018 · commit 444cc420580a · 2019-01-25T15:10:15.000-06:00
diff --git a/src/TensorFlowNET.Core/Operations/Operation.cs b/src/TensorFlowNET.Core/Operations/Operation.cs
@@ -36,7 +36,7 @@ public unsafe TF_Input[] OutputConsumers(int index, int max_consumers)
             var handle = Marshal.AllocHGlobal(size);
             int num = c_api.TF_OperationOutputConsumers(new TF_Output(_handle, index), handle, max_consumers);
             var consumers = new TF_Input[num];
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 consumers[i] = Marshal.PtrToStructure<TF_Input>(handle + i * size);
             }
@@ -50,7 +50,7 @@ public unsafe Operation[] GetControlInputs()
         {
             var control_inputs = new Operation[NumControlInputs];
 
-            if(NumControlInputs > 0)
+            if (NumControlInputs > 0)
             {
                 IntPtr control_input_handle = Marshal.AllocHGlobal(Marshal.SizeOf<IntPtr>() * NumControlInputs);
                 c_api.TF_OperationGetControlInputs(_handle, control_input_handle, NumControlInputs);
@@ -70,7 +70,7 @@ public unsafe Operation[] GetControlOutputs()
         {
             var control_outputs = new Operation[NumControlOutputs];
 
-            if(NumControlOutputs > 0)
+            if (NumControlOutputs > 0)
             {
                 IntPtr control_output_handle = Marshal.AllocHGlobal(Marshal.SizeOf<IntPtr>() * NumControlOutputs);
                 c_api.TF_OperationGetControlOutputs(_handle, control_output_handle, NumControlInputs);
@@ -89,7 +89,7 @@ public Tensor[] outputs
         {
             get
             {
-                if(_outputs == null)
+                if (_outputs == null)
                 {
                     _outputs = new Tensor[NumOutputs];
 
@@ -106,7 +106,7 @@ public InputList inputs
         {
             get
             {
-                if(_inputs == null)
+                if (_inputs == null)
                 {
                     var retval = new Tensor[NumInputs];
 
@@ -124,6 +124,18 @@ public InputList inputs
             }
         }
 
+        private NodeDef _node_def;
+        public NodeDef node_def
+        {
+            get
+            {
+                if(_node_def == null)
+                    _node_def = GetNodeDef();
+
+                return _node_def;
+            }
+        }
+
         public Operation(IntPtr handle)
         {
             if (handle == IntPtr.Zero)
@@ -195,7 +207,7 @@ public TF_AttrMetadata GetAttributeMetadata(string attr_name, Status s)
             return c_api.TF_OperationGetAttrMetadata(_handle, attr_name, s);
         }
 
-        public NodeDef GetNodeDef()
+        private NodeDef GetNodeDef()
         {
             using (var s = new Status())
             using (var buffer = new Buffer())
diff --git a/src/TensorFlowNET.Core/Tensors/TF_DataType.cs b/src/TensorFlowNET.Core/Tensors/TF_DataType.cs
@@ -36,6 +36,8 @@ public enum TF_DataType
         TF_UINT32 = 22,
         TF_UINT64 = 23,
 
+        DtFloatRef = 101, // DT_FLOAT_REF
         DtDoubleRef = 102, // DT_DOUBLE_REF
+        DtInt32Ref = 103, // DT_INT32_REF
     }
 }
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -162,6 +162,7 @@ public Tensor(Operation op, int value_index, TF_DataType dtype)
             this.op = op;
             this.value_index = value_index;
             this._dtype = dtype;
+            _id = ops.uid();
         }
 
         public List<Operation> consumers()
diff --git a/src/TensorFlowNET.Core/Variables/RefVariable.cs b/src/TensorFlowNET.Core/Variables/RefVariable.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Tensorflow
@@ -69,14 +70,15 @@ private void _init_from_args(object initial_value,
                 {
 
                 }
+                // Or get the initial value from a Tensor or Python object.
                 else
                 {
                     _initial_value = ops.convert_to_tensor(initial_value, name: "initial_value");
-                }
 
-                var shape = _initial_value.shape;
-                dtype = _initial_value.dtype;
-                _variable = gen_state_ops.variable_v2(shape, dtype, name);
+                    var shape = _initial_value.shape;
+                    dtype = _initial_value.dtype;
+                    _variable = gen_state_ops.variable_v2(shape, dtype, name);
+                }
 
                 // Manually overrides the variable's shape with the initial value's.
                 if (validate_shape)
@@ -87,8 +89,9 @@ private void _init_from_args(object initial_value,
                 // If 'initial_value' makes use of other variables, make sure we don't
                 // have an issue if these other variables aren't initialized first by
                 // using their initialized_value() method.
+                var _initial_value2 = _try_guard_against_uninitialized_dependencies(_initial_value);
 
-                _initializer_op = gen_state_ops.assign(_variable, _initial_value, validate_shape).op;
+                _initializer_op = gen_state_ops.assign(_variable, _initial_value2, validate_shape).op;
 
                 if (!String.IsNullOrEmpty(caching_device))
                 {
@@ -112,5 +115,51 @@ public Tensor _AsTensor()
         {
             return _snapshot;
         }
+
+        /// <summary>
+        /// Attempt to guard against dependencies on uninitialized variables.
+        /// </summary>
+        /// <param name="initial_value"></param>
+        private Tensor _try_guard_against_uninitialized_dependencies(Tensor initial_value)
+        {
+            return _safe_initial_value_from_tensor(initial_value, new Dictionary<string, Operation>());
+        }
+
+        /// <summary>
+        /// Replace dependencies on variables with their initialized values.
+        /// </summary>
+        /// <param name="tensor">A `Tensor`. The tensor to replace.</param>
+        /// <param name="op_cache">A dict mapping operation names to `Operation`s.</param>
+        /// <returns>A `Tensor` compatible with `tensor`.</returns>
+        private Tensor _safe_initial_value_from_tensor(Tensor tensor, Dictionary<string, Operation> op_cache)
+        {
+            var op = tensor.op;
+            var new_op = op_cache.ContainsKey(op.Name) ? op_cache[op.Name] : null;
+            if(new_op == null)
+            {
+                new_op = _safe_initial_value_from_op(op, op_cache);
+                op_cache[op.Name] = new_op;
+            }
+            return new_op.outputs[tensor.value_index];
+        }
+
+        private Operation _safe_initial_value_from_op(Operation op, Dictionary<string, Operation> op_cache)
+        {
+            var op_type = op.node_def.Op;
+            switch (op_type)
+            {
+                case "IsVariableInitialized":
+                case "VarIsInitializedOp":
+                case "ReadVariableOp":
+                    return op;
+                case "Variable":
+                case "VariableV2":
+                case "VarHandleOp":
+                    break;
+            }
+
+            // Recursively build initializer expressions for inputs.
+            return op;
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/Variables/gen_state_ops.py.cs b/src/TensorFlowNET.Core/Variables/gen_state_ops.py.cs
@@ -42,7 +42,7 @@ public static Tensor variable_v2(long[] shape, TF_DataType dtype, string name =
 
             _execute.record_gradient("VariableV2", _inputs_flat, _attrs, _result, name);
 
-            return new Tensor(_op, 0, dtype);
+            return _result[0];
         }
 
         /// <summary>
diff --git a/test/TensorFlowNET.UnitTest/GraphTest.cs b/test/TensorFlowNET.UnitTest/GraphTest.cs
@@ -130,7 +130,7 @@ public void Graph()
             EXPECT_EQ(TF_Code.TF_OK, s.Code);
 
             // Serialize to NodeDef.
-            var node_def = neg.GetNodeDef();
+            var node_def = neg.node_def;
 
             // Validate NodeDef is what we expect.
             ASSERT_TRUE(c_test_util.IsNeg(node_def, "add"));
@@ -145,13 +145,13 @@ public void Graph()
             // Look up some nodes by name.
             Operation neg2 = c_api.TF_GraphOperationByName(graph, "neg");
             EXPECT_EQ(neg, neg2);
-            var node_def2 = neg2.GetNodeDef();
+            var node_def2 = neg2.node_def;
             EXPECT_EQ(node_def.ToString(), node_def2.ToString());
 
             Operation feed2 = c_api.TF_GraphOperationByName(graph, "feed");
             EXPECT_EQ(feed, feed2);
-            node_def = feed.GetNodeDef();
-            node_def2 = feed2.GetNodeDef();
+            node_def = feed.node_def;
+            node_def2 = feed2.node_def;
             EXPECT_EQ(node_def.ToString(), node_def2.ToString());
 
             // Test iterating through the nodes of a graph.
@@ -186,7 +186,7 @@ public void Graph()
                 }
                 else
                 {
-                    node_def = oper.GetNodeDef();
+                    node_def = oper.node_def;
                     Assert.Fail($"Unexpected Node: {node_def.ToString()}");
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public unsafe TF_Input[] OutputConsumers(int index, int max_consumers)`
`36`	`36`	`var handle = Marshal.AllocHGlobal(size);`
`37`	`37`	`int num = c_api.TF_OperationOutputConsumers(new TF_Output(_handle, index), handle, max_consumers);`
`38`	`38`	`var consumers = new TF_Input[num];`
`39`		`- for(int i = 0; i < num; i++)`
	`39`	`+ for (int i = 0; i < num; i++)`
`40`	`40`	`{`
`41`	`41`	`consumers[i] = Marshal.PtrToStructure<TF_Input>(handle + i * size);`
`42`	`42`	`}`
`@@ -50,7 +50,7 @@ public unsafe Operation[] GetControlInputs()`
`50`	`50`	`{`
`51`	`51`	`var control_inputs = new Operation[NumControlInputs];`
`52`	`52`
`53`		`- if(NumControlInputs > 0)`
	`53`	`+ if (NumControlInputs > 0)`
`54`	`54`	`{`
`55`	`55`	`IntPtr control_input_handle = Marshal.AllocHGlobal(Marshal.SizeOf<IntPtr>() * NumControlInputs);`
`56`	`56`	`c_api.TF_OperationGetControlInputs(_handle, control_input_handle, NumControlInputs);`
`@@ -70,7 +70,7 @@ public unsafe Operation[] GetControlOutputs()`
`70`	`70`	`{`
`71`	`71`	`var control_outputs = new Operation[NumControlOutputs];`
`72`	`72`
`73`		`- if(NumControlOutputs > 0)`
	`73`	`+ if (NumControlOutputs > 0)`
`74`	`74`	`{`
`75`	`75`	`IntPtr control_output_handle = Marshal.AllocHGlobal(Marshal.SizeOf<IntPtr>() * NumControlOutputs);`
`76`	`76`	`c_api.TF_OperationGetControlOutputs(_handle, control_output_handle, NumControlInputs);`
`@@ -89,7 +89,7 @@ public Tensor[] outputs`
`89`	`89`	`{`
`90`	`90`	`get`
`91`	`91`	`{`
`92`		`- if(_outputs == null)`
	`92`	`+ if (_outputs == null)`
`93`	`93`	`{`
`94`	`94`	`_outputs = new Tensor[NumOutputs];`
`95`	`95`
`@@ -106,7 +106,7 @@ public InputList inputs`
`106`	`106`	`{`
`107`	`107`	`get`
`108`	`108`	`{`
`109`		`- if(_inputs == null)`
	`109`	`+ if (_inputs == null)`
`110`	`110`	`{`
`111`	`111`	`var retval = new Tensor[NumInputs];`
`112`	`112`
`@@ -124,6 +124,18 @@ public InputList inputs`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ private NodeDef _node_def;`
	`128`	`+ public NodeDef node_def`
	`129`	`+ {`
	`130`	`+ get`
	`131`	`+ {`
	`132`	`+ if(_node_def == null)`
	`133`	`+ _node_def = GetNodeDef();`
	`134`	`+`
	`135`	`+ return _node_def;`
	`136`	`+ }`
	`137`	`+ }`
	`138`	`+`
`127`	`139`	`public Operation(IntPtr handle)`
`128`	`140`	`{`
`129`	`141`	`if (handle == IntPtr.Zero)`
`@@ -195,7 +207,7 @@ public TF_AttrMetadata GetAttributeMetadata(string attr_name, Status s)`
`195`	`207`	`return c_api.TF_OperationGetAttrMetadata(_handle, attr_name, s);`
`196`	`208`	`}`
`197`	`209`
`198`		`- public NodeDef GetNodeDef()`
	`210`	`+ private NodeDef GetNodeDef()`
`199`	`211`	`{`
`200`	`212`	`using (var s = new Status())`
`201`	`213`	`using (var buffer = new Buffer())`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public enum TF_DataType`
`36`	`36`	`TF_UINT32 = 22,`
`37`	`37`	`TF_UINT64 = 23,`
`38`	`38`
	`39`	`+ DtFloatRef = 101, // DT_FLOAT_REF`
`39`	`40`	`DtDoubleRef = 102, // DT_DOUBLE_REF`
	`41`	`+ DtInt32Ref = 103, // DT_INT32_REF`
`40`	`42`	`}`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ public Tensor(Operation op, int value_index, TF_DataType dtype)`
`162`	`162`	`this.op = op;`
`163`	`163`	`this.value_index = value_index;`
`164`	`164`	`this._dtype = dtype;`
	`165`	`+ _id = ops.uid();`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`public List<Operation> consumers()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static Tensor variable_v2(long[] shape, TF_DataType dtype, string name =`
`42`	`42`
`43`	`43`	`_execute.record_gradient("VariableV2", _inputs_flat, _attrs, _result, name);`
`44`	`44`
`45`		`- return new Tensor(_op, 0, dtype);`
	`45`	`+ return _result[0];`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <summary>`