Add TF_UpdateEdge APIs.

Oceania2018 · Oceania2018 · commit f41d6bcb5484 · 2020-09-20T10:37:04.000-05:00
diff --git a/src/TensorFlowNET.Core/APIs/c_api.cs b/src/TensorFlowNET.Core/APIs/c_api.cs
@@ -43,7 +43,7 @@ namespace Tensorflow
     /// </summary>
     public partial class c_api
     {
-        public const string TensorFlowLibName = @"C:\Users\haipi\Documents\Projects\tensorflow\bazel-bin\tensorflow\tensorflow";
+        public const string TensorFlowLibName = "tensorflow";
 
         public static string StringPiece(IntPtr handle)
         {
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.cs b/src/TensorFlowNET.Core/Graphs/Graph.cs
@@ -278,11 +278,7 @@ public Operation create_op(string op_type, Tensor[] inputs, TF_DataType[] dtypes
             // after removing the trailing '/'.
             name = name.EndsWith("/") ? ops.name_from_scope_name(name) : unique_name(name);
             var node_def = ops._NodeDef(op_type, name, attrs: attrs);
-            if (name == "rnn/while/basic_rnn_cell/MatMul" 
-                || name == "rnn/while/basic_rnn_cell/MatMul/Enter")
-            {
 
-            }
             var input_ops = inputs.Select(x => x.op).ToArray();
             var control_inputs = _control_dependencies_for_inputs(input_ops);
 
diff --git a/src/TensorFlowNET.Core/Graphs/c_api.graph.cs b/src/TensorFlowNET.Core/Graphs/c_api.graph.cs
@@ -321,6 +321,6 @@ public static extern void TF_GraphSetOutputHandleShapesAndTypes(IntPtr graph, TF
         /// <param name="status">TF_Status*</param>
         [DllImport(TensorFlowLibName)]
         
-        public static extern void UpdateEdge(IntPtr graph, TF_Output new_src, TF_Input dst, SafeStatusHandle status);
+        public static extern void TF_UpdateEdge(IntPtr graph, TF_Output new_src, TF_Input dst, SafeStatusHandle status);
     }
 }
diff --git a/src/TensorFlowNET.Core/Operations/Operation.cs b/src/TensorFlowNET.Core/Operations/Operation.cs
@@ -326,7 +326,7 @@ public void _update_input(int index, Tensor tensor)
             // the updated inputs are reloaded from the c_api
             lock (Locks.ProcessWide)
             {
-                c_api.UpdateEdge(_graph, output, input, tf.Status.Handle);
+                c_api.TF_UpdateEdge(_graph, output, input, tf.Status.Handle);
                 //var updated_inputs = inputs;
                 tf.Status.Check();
             }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ namespace Tensorflow`
`43`	`43`	`/// </summary>`
`44`	`44`	`public partial class c_api`
`45`	`45`	`{`
`46`		`- public const string TensorFlowLibName = @"C:\Users\haipi\Documents\Projects\tensorflow\bazel-bin\tensorflow\tensorflow";`
	`46`	`+ public const string TensorFlowLibName = "tensorflow";`
`47`	`47`
`48`	`48`	`public static string StringPiece(IntPtr handle)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,6 @@ public static extern void TF_GraphSetOutputHandleShapesAndTypes(IntPtr graph, TF`
`321`	`321`	`/// <param name="status">TF_Status*</param>`
`322`	`322`	`[DllImport(TensorFlowLibName)]`
`323`	`323`
`324`		`- public static extern void UpdateEdge(IntPtr graph, TF_Output new_src, TF_Input dst, SafeStatusHandle status);`
	`324`	`+ public static extern void TF_UpdateEdge(IntPtr graph, TF_Output new_src, TF_Input dst, SafeStatusHandle status);`
`325`	`325`	`}`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ public void _update_input(int index, Tensor tensor)`
`326`	`326`	`// the updated inputs are reloaded from the c_api`
`327`	`327`	`lock (Locks.ProcessWide)`
`328`	`328`	`{`
`329`		`- c_api.UpdateEdge(_graph, output, input, tf.Status.Handle);`
	`329`	`+ c_api.TF_UpdateEdge(_graph, output, input, tf.Status.Handle);`
`330`	`330`	`//var updated_inputs = inputs;`
`331`	`331`	`tf.Status.Check();`
`332`	`332`	`}`