Fixed Node 57, but node 61 still error. SciSharp#226

Oceania2018 · Oceania2018 · commit 6fc9add86379 · 2019-04-11T22:31:09.000-05:00
diff --git a/src/TensorFlowNET.Core/Operations/ControlFlows/CondContext.cs b/src/TensorFlowNET.Core/Operations/ControlFlows/CondContext.cs
@@ -73,9 +73,9 @@ public override Tensor AddValue(Tensor val)
                 // Use the real value if it comes from outer context. This is needed in
                 // particular for nested conds.
                 if (_external_values.ContainsKey(val.name))
-                    result = _external_values[val.name];
-                else
-                    result = val;
+                    result = _external_values[val.name];
+
+                result = result == null ? val : result;
             }
             else
             {
@@ -89,6 +89,11 @@ public override Tensor AddValue(Tensor val)
                     _external_values[result.name] = result;
                 }
                 
+                // for debug purpose
+                if(ops.get_default_graph()._nodes_by_name.Count > 60)
+                {
+                }
+
                 with(ops.control_dependencies(null), ctrl =>
                 {
                     var (r0, r1) = control_flow_ops._SwitchRefOrTensor(result, _pred);
diff --git a/src/TensorFlowNET.Core/Operations/Operation.cs b/src/TensorFlowNET.Core/Operations/Operation.cs
@@ -279,11 +279,13 @@ public override bool Equals(object obj)
         /// <param name="tensor"> the Tensor to be used as the input at the given index.</param>
         public void _update_input(int index, Tensor tensor)
         {
+            _assert_same_graph(tensor);
+
             var input = _tf_input(index);
-            var output = tensor._as_tf_output();
-            _assert_same_graph( tensor);
-            // Reset cached inputs.
-            _inputs=new InputList(new Tensor[]{ tensor }); // is this right? original code: self._inputs_val=None
+            var output = tensor._as_tf_output();
+
+            // Reset cached inputs.
+            _inputs = null;// new InputList(new Tensor[] { tensor }); // is this right? original code: self._inputs_val=None
             // TODO: implement below code dependencies
             //c_api.UpdateEdge(_graph._c_graph, output, input);
         }

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ public override Tensor AddValue(Tensor val)`
`73`	`73`	`// Use the real value if it comes from outer context. This is needed in`
`74`	`74`	`// particular for nested conds.`
`75`	`75`	`if (_external_values.ContainsKey(val.name))`
`76`		`- result = _external_values[val.name];`
`77`		`- else`
`78`		`- result = val;`
	`76`	`+ result = _external_values[val.name];`
	`77`	`+`
	`78`	`+ result = result == null ? val : result;`
`79`	`79`	`}`
`80`	`80`	`else`
`81`	`81`	`{`
`@@ -89,6 +89,11 @@ public override Tensor AddValue(Tensor val)`
`89`	`89`	`_external_values[result.name] = result;`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ // for debug purpose`
	`93`	`+ if(ops.get_default_graph()._nodes_by_name.Count > 60)`
	`94`	`+ {`
	`95`	`+ }`
	`96`	`+`
`92`	`97`	`with(ops.control_dependencies(null), ctrl =>`
`93`	`98`	`{`
`94`	`99`	`var (r0, r1) = control_flow_ops._SwitchRefOrTensor(result, _pred);`