fix CondContext.AddValue with ops.control_dependencies SciSharp#213

Oceania2018 · Oceania2018 · commit 04ffa46d7b7e · 2019-04-10T21:17:02.000-05:00
diff --git a/src/TensorFlowNET.Core/Operations/ControlFlows/CondContext.cs b/src/TensorFlowNET.Core/Operations/ControlFlows/CondContext.cs
@@ -88,14 +88,14 @@ public override Tensor AddValue(Tensor val)
                     _values.Add(result.name);
                     _external_values[result.name] = result;
                 }
-                // TODO: how to do 'with' here??
-                //with(ops.control_dependencies(null), ctrl =>
-                //{
-                var (r0, r1) = control_flow_ops._SwitchRefOrTensor(result, _pred);
-                result = new[]{r0, r1}[_branch];
-                if (_outer_context != null)
-                    _outer_context.AddInnerOp(result.op);
-                //});
+                
+                with(ops.control_dependencies(null), ctrl =>
+                {
+                    var (r0, r1) = control_flow_ops._SwitchRefOrTensor(result, _pred);
+                    result = new[] { r0, r1 }[_branch];
+                    if (_outer_context != null)
+                        _outer_context.AddInnerOp(result.op);
+                });
 
                 result.op.graph.prevent_fetching(result.op);
                 result.op._set_control_flow_context(this);
diff --git a/src/TensorFlowNET.Core/Operations/ControlFlows/ControlFlowContext.cs b/src/TensorFlowNET.Core/Operations/ControlFlows/ControlFlowContext.cs
@@ -22,7 +22,7 @@ namespace Tensorflow.Operations
     /// 4. A ControlFlowContext has _context_stack.
     /// Pushed and popped by ctxt.Enter() and ctxt.Exit()
     /// </summary>
-    public abstract class ControlFlowContext : IPython, IControlFlowContext
+    public abstract class ControlFlowContext : Python, IPython, IControlFlowContext
     {
         /// <summary>
         /// The predicate tensor in this branch
diff --git a/src/TensorFlowNET.Core/Operations/check_ops.cs b/src/TensorFlowNET.Core/Operations/check_ops.cs
@@ -35,7 +35,8 @@ public static Operation assert_equal(object t1, object t2, object[] data = null,
                     };
                 }
 
-                var condition = math_ops.reduce_all(gen_math_ops.equal(x, y));
+                var eq = gen_math_ops.equal(x, y);
+                var condition = math_ops.reduce_all(eq);
                 var x_static = tensor_util.constant_value(x);
                 var y_static = tensor_util.constant_value(y);
                 return control_flow_ops.Assert(condition, data);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace Tensorflow.Operations`
`22`	`22`	`/// 4. A ControlFlowContext has _context_stack.`
`23`	`23`	`/// Pushed and popped by ctxt.Enter() and ctxt.Exit()`
`24`	`24`	`/// </summary>`
`25`		`- public abstract class ControlFlowContext : IPython, IControlFlowContext`
	`25`	`+ public abstract class ControlFlowContext : Python, IPython, IControlFlowContext`
`26`	`26`	`{`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// The predicate tensor in this branch`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public static Operation assert_equal(object t1, object t2, object[] data = null,`
`35`	`35`	`};`
`36`	`36`	`}`
`37`	`37`
`38`		`- var condition = math_ops.reduce_all(gen_math_ops.equal(x, y));`
	`38`	`+ var eq = gen_math_ops.equal(x, y);`
	`39`	`+ var condition = math_ops.reduce_all(eq);`
`39`	`40`	`var x_static = tensor_util.constant_value(x);`
`40`	`41`	`var y_static = tensor_util.constant_value(y);`
`41`	`42`	`return control_flow_ops.Assert(condition, data);`