FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add FunctionCallOptions. · MSavameri/TensorFlow.NET@e19e59b · GitHub

  1. MSavameri
  2. TensorFlow.NET

Repository navigation

Commit e19e59b

Browse files
Oceania2018
committed
Add FunctionCallOptions.
1 parent 93fd34b commit e19e59b

10 files changed

Lines changed: 62 additions & 20 deletions

File tree

‎src/TensorFlowNET.Core/Contexts/Context.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public sealed class Context : IDisposable
3535
public string ScopeName { get; set; } = "";
3636
bool initialized = false;
3737
ContextSwitchStack context_switches;
38+
public FunctionCallOptions FunctionCallOptions { get; }
3839

3940
public SafeContextHandle Handle { get; }
4041

@@ -44,6 +45,7 @@ public Context(ContextOptions opts, Status status)
4445
status.Check(true);
4546
context_switches = new ContextSwitchStack(defaultExecutionMode == EAGER_MODE, false);
4647
initialized = true;
48+
FunctionCallOptions = new FunctionCallOptions();
4749
}
4850

4951
/// <summary>

‎src/TensorFlowNET.Core/Contexts/FunctionCallOptions.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
using Google.Protobuf;
5+
using Google.Protobuf.Collections;
6+
7+
namespace Tensorflow.Contexts
8+
{
9+
public class FunctionCallOptions
10+
{
11+
public string config_proto_serialized()
12+
{
13+
var config = new ConfigProto
14+
{
15+
AllowSoftPlacement = true,
16+
};
17+
return config.ToByteString().ToStringUtf8();
18+
}
19+
}
20+
}

‎src/TensorFlowNET.Core/Eager/EagerRunner.TFE_FastPathExecute.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ bool SetOpAttrScalar(Context ctx, SafeOpHandle op,
371371
switch (type)
372372
{
373373
case TF_AttrType.TF_ATTR_STRING:
374-
c_api.TFE_OpSetAttrString(op, key, value.ToString(), (uint)value.ToString().Length);
374+
c_api.TFE_OpSetAttrString(op, key, value.ToString(), (ulong)value.ToString().Length);
375375
break;
376376
case TF_AttrType.TF_ATTR_TYPE:
377377
c_api.TFE_OpSetAttrType(op, key, (TF_DataType)value);

‎src/TensorFlowNET.Core/Eager/c_api.eager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public static void TFE_Execute(SafeOpHandle op, SafeTensorHandleHandle[] retvals
241241
/// <param name="value">const void*</param>
242242
/// <param name="length">size_t</param>
243243
[DllImport(TensorFlowLibName)]
244-
public static extern void TFE_OpSetAttrString(SafeOpHandle op, string attr_name, string value, uint length);
244+
public static extern void TFE_OpSetAttrString(SafeOpHandle op, string attr_name, string value, ulong length);
245245

246246
[DllImport(TensorFlowLibName)]
247247
public static extern void TFE_OpSetAttrTypeList(SafeOpHandle op, string attr_name, TF_DataType[] values, int num_values);

‎src/TensorFlowNET.Core/Functions/ConcreteFunction.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class ConcreteFunction : IDisposable
1414
{
1515
IntPtr _handle;
1616
FuncGraph func_graph;
17+
public Tensor[] CapturedInputs => func_graph.external_captures();
1718

1819
public string Name
1920
{
@@ -38,6 +39,8 @@ public ConcreteFunction(string name)
3839
public ConcreteFunction(FuncGraph graph, Dictionary<string, string> attrs)
3940
{
4041
func_graph = graph;
42+
43+
ToGraph(graph.Inputs, graph.Outputs);
4144
}
4245

4346
public ConcreteFunction(Func<Tensor, Tensor> func, TF_DataType dtype)
@@ -124,6 +127,21 @@ public Tensors Invoke(Tensors inputs)
124127
return flat_outputs;
125128
}
126129

130+
public Tensor[] CallFlat(Tensor[] args, Tensor[] captured_inputs)
131+
{
132+
var new_args = new List<Tensor>();
133+
new_args.AddRange(args);
134+
new_args.AddRange(captured_inputs);
135+
args = new_args.ToArray();
136+
137+
var attrs = new object[]
138+
{
139+
"executor_type", "",
140+
"config_proto", tf.Context.FunctionCallOptions.config_proto_serialized()
141+
};
142+
return tf.Runner.Execute(tf.Context, func_graph.FuncName, 1, args, attrs);
143+
}
144+
127145
ForwardBackwardCall SelectForwardAndBackwardFunctions(Tensors args, int possible_gradient_type, bool executing_eagerly)
128146
{
129147
var functions = new FirstOrderTapeGradientFunctions(func_graph, false);

‎src/TensorFlowNET.Core/Functions/TapeGradientFunctions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Record(Tensors flat_outputs, Tensors inference_args)
4848
getBackwardFunction: () => backward_function);
4949
}
5050

51-
(BackwardFunction, Tensors) _wrap_backward_function(FuncGraph forward_graph, ConcreteFunction backward, Tensors flat_outputs)
51+
(BackwardFunction, Tensors) _wrap_backward_function(FuncGraph forward_graph, ConcreteFunction backward, Tensors outputs)
5252
{
5353
BackwardFunction _backward_function_wrapper = (output_grads, unneeded_gradients) =>
5454
{
@@ -61,10 +61,11 @@ public void Record(Tensors flat_outputs, Tensors inference_args)
6161
processed_args.add(arg);
6262
input_index += 1;
6363
}
64-
return output_grads;// backward.Invoke(processed_args.ToArray());
64+
65+
return backward.CallFlat(processed_args.ToArray(), outputs);
6566
};
6667

67-
return (_backward_function_wrapper, flat_outputs);
68+
return (_backward_function_wrapper, outputs);
6869
}
6970

7071
protected (EagerDefinedFunction, FuncGraph, ConcreteFunction, List<int>, int)
@@ -82,24 +83,23 @@ public void Record(Tensors flat_outputs, Tensors inference_args)
8283
}
8384

8485
var gradients_wrt_outputs = new List<Tensor>();
85-
var backwards_graph = new FuncGraph($"{_BACKWARD_PREFIX}{_func_graph.FuncName}_{ops.uid()}");
86+
var backwards_graph = new FuncGraph($"{_BACKWARD_PREFIX}_{ops.uid()}");
8687
foreach (var output in trainable_outputs)
8788
gradients_wrt_outputs.Add(tf.placeholder(output.dtype, output.shape));
8889
var gradients_wrt_inputs = gradients_util._GradientsHelper(trainable_outputs.ToArray(),
8990
_func_graph.Inputs,
9091
grad_ys: gradients_wrt_outputs.ToArray(),
9192
src_graph: _func_graph);
9293

93-
tf.Context.restore_mode();
94-
95-
var forward_function_name = $"{_FORWARD_PREFIX}{_func_graph.FuncName}_{ops.uid()}";
94+
var forward_function_name = $"{_FORWARD_PREFIX}_{ops.uid()}";
9695
var backward_function_attr = new Dictionary<string, string>();
9796
backward_function_attr[FORWARD_FUNCTION_ATTRIBUTE_NAME] = forward_function_name;
97+
gradients_wrt_outputs.append(backwards_graph.internal_captures());
9898
backwards_graph.Inputs = gradients_wrt_outputs;
9999
backwards_graph.Outputs = gradients_wrt_inputs;
100100

101101
var backward_function = new ConcreteFunction(backwards_graph, backward_function_attr);
102-
102+
103103
var forward_function_attr = new Dictionary<string, string>();
104104
forward_function_attr[BACKWARD_FUNCTION_ATTRIBUTE_NAME] = backward_function.Name;
105105
var forward_function = new EagerDefinedFunction(forward_function_name, _func_graph,

‎src/TensorFlowNET.Core/Gradients/ops.gradient_function_mapping.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public static void RegisterFromAssembly()
4949
RegisterGradientFunction(m.GetCustomAttribute<RegisterGradient>().Name,
5050
(oper, out_grads) =>
5151
{
52-
tf.Logger.Debug($"Caculate Gradient: {m.Name}");
52+
tf.Logger.Debug($"Caculate Gradient: {oper.name} {m.Name}");
5353
var results = g.InvokeMember(m.Name,
5454
BindingFlags.InvokeMethod,
5555
null,
5656
null,
5757
args: new object[] { oper, out_grads }) as Tensor[];
5858
foreach (var result in results.Where(x => x != null))
59-
tf.Logger.Debug($"{result.TensorShape}");
59+
tf.Logger.Debug($"Gradient: {result.name} {result.TensorShape}");
6060
return results;
6161
}
6262
);

‎src/TensorFlowNET.Core/Graphs/FuncGraph.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ public class FuncGraph : Graph
2626
public Tensors Outputs { get; set; }
2727
public Dictionary<string, string> Attrs { get; set; }
2828

29-
Dictionary<long, (Tensor, Tensor)> _captures = new Dictionary<long, (Tensor, Tensor)>();
29+
// new Dictionary<long, (Tensor, Tensor)> _captures = new Dictionary<long, (Tensor, Tensor)>();
30+
// public new Tensor[] external_captures => _captures.Values.Select(x => x.Item1).ToArray();
31+
3032
/// <summary>
3133
/// Construct a new FuncGraph.
3234
/// </summary>
@@ -129,7 +131,7 @@ Tensor capture(Tensor tensor, string name = null, TF_DataType shape = TF_DataTyp
129131
Tensor _capture_helper(Tensor tensor, string name, TensorShape shape = null)
130132
{
131133
Tensor placeholder = null;
132-
if (!_captures.ContainsKey(tensor.Id))
134+
if (!_captures.Contains(tensor.Id))
133135
{
134136
placeholder = _create_substitute_placeholder(tensor,
135137
name: name,
@@ -139,7 +141,7 @@ Tensor _capture_helper(Tensor tensor, string name, TensorShape shape = null)
139141
}
140142
else
141143
{
142-
placeholder = _captures[tensor.Id].Item1;
144+
placeholder = (((Tensor, Tensor))_captures[tensor.Id]).Item2;
143145
}
144146

145147
BackwardFunction _backward_function_wrapper = (output_grads, unneeded_gradients) =>

‎src/TensorFlowNET.Core/Graphs/Graph.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,16 +557,16 @@ public static implicit operator IntPtr(Graph graph)
557557

558558
public Tensor[] external_captures()
559559
{
560-
Tensor[] captures = new Tensor[this._captures.Count];
561-
ICollection inner = this._captures.Keys; // c[0]
560+
Tensor[] captures = new Tensor[_captures.Count];
561+
ICollection inner = _captures.Keys; // c[0]
562562
inner.CopyTo(captures, 0);
563563
return captures;
564564
}
565565

566566
public Tensor[] internal_captures()
567567
{
568-
Tensor[] captures = new Tensor[this._captures.Count];
569-
ICollection inner = this._captures.Values; // c[1]
568+
Tensor[] captures = new Tensor[_captures.Count];
569+
ICollection inner = _captures.Values; // c[1]
570570
inner.CopyTo(captures, 0);
571571
return captures;
572572
}

‎src/TensorFlowNET.Keras/Engine/Functional.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Tensors run_internal_graph(Tensors inputs, bool training = false, Tensors mask =
340340
tf.Logger.Debug($"{depth}: {node.Layer}: {node.Layer.Name}");
341341
var outputs = node.Layer.Apply(layer_inputs, is_training: training);
342342
foreach (var output in outputs.Where(x => x != null))
343-
tf.Logger.Debug($"{output.TensorShape}");
343+
tf.Logger.Debug($"{depth}: {node.Layer}: {node.Layer.Name} {output.TensorShape}");
344344
// Update tensor_dict for next input
345345
foreach (var (x_id, y) in zip(node.FlatOutputIds, outputs))
346346
tensor_dict[x_id] = new Queue<Tensor>(Enumerable.Range(0, tensor_usage_count[x_id]).Select(x => y));

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL