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

add dynamic_rnn, _transpose_batch_time for RNN. · MSavameri/TensorFlow.NET@d674d51 · GitHub

  1. MSavameri
  2. TensorFlow.NET

Repository navigation

Commit d674d51

Browse files
Oceania2018
committed
add dynamic_rnn, _transpose_batch_time for RNN.
1 parent 1fc3838 commit d674d51

10 files changed

Lines changed: 213 additions & 30 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Read the docs & book [The Definitive Guide to Tensorflow.NET](https://tensorflow
129129
Run specific example in shell:
130130

131131
```cs
132-
dotnet TensorFlowNET.Examples.dll "EXAMPLE NAME"
132+
dotnet TensorFlowNET.Examples.dll -ex "MNIST CNN"
133133
```
134134

135135
Example runner will download all the required files like training data and model pb files.

‎src/TensorFlowNET.Core/APIs/tf.nn.cs‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,12 @@ public static Tensor dropout(Tensor x, Tensor keep_prob = null, Tensor noise_sha
7979
/// <param name="swap_memory"></param>
8080
/// <param name="time_major"></param>
8181
/// <returns>A pair (outputs, state)</returns>
82-
public static (Tensor, Tensor) dynamic_rnn(RNNCell cell, Tensor inputs, TF_DataType dtype = TF_DataType.DtInvalid,
83-
bool swap_memory = false, bool time_major = false)
84-
{
85-
with(variable_scope("rnn"), scope =>
86-
{
87-
VariableScope varscope = scope;
88-
var flat_input = nest.flatten(inputs);
89-
90-
if (!time_major)
91-
{
92-
flat_input = flat_input.Select(x => ops.convert_to_tensor(x)).ToList();
93-
//flat_input = flat_input.Select(x => _transpose_batch_time(x)).ToList();
94-
}
95-
});
96-
97-
throw new NotImplementedException("");
98-
}
82+
public static (Tensor, Tensor) dynamic_rnn(RNNCell cell, Tensor inputs,
83+
int? sequence_length = null, TF_DataType dtype = TF_DataType.DtInvalid,
84+
int? parallel_iterations = null, bool swap_memory = false, bool time_major = false)
85+
=> rnn.dynamic_rnn(cell, inputs, sequence_length: sequence_length, dtype: dtype,
86+
parallel_iterations: parallel_iterations, swap_memory: swap_memory,
87+
time_major: time_major);
9988

10089
public static Tensor elu(Tensor features, string name = null)
10190
=> gen_nn_ops.elu(features, name: name);

‎src/TensorFlowNET.Core/Operations/BasicRNNCell.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class BasicRNNCell : LayerRNNCell
2727
int _num_units;
2828
Func<Tensor, string, Tensor> _activation;
2929

30+
protected override int state_size => _num_units;
31+
3032
public BasicRNNCell(int num_units,
3133
Func<Tensor, string, Tensor> activation = null,
3234
bool? reuse = null,

‎src/TensorFlowNET.Core/Operations/NnOps/rnn.cs‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*****************************************************************************
2+
Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
******************************************************************************/
16+
17+
using System;
18+
using System.Collections.Generic;
19+
using System.Text;
20+
using System.Linq;
21+
using static Tensorflow.Python;
22+
using Tensorflow.Util;
23+
24+
namespace Tensorflow.Operations
25+
{
26+
internal class rnn
27+
{
28+
public static (Tensor, Tensor) dynamic_rnn(RNNCell cell, Tensor inputs,
29+
int? sequence_length = null, Tensor initial_state = null,
30+
TF_DataType dtype = TF_DataType.DtInvalid,
31+
int? parallel_iterations = null, bool swap_memory = false, bool time_major = false)
32+
{
33+
with(tf.variable_scope("rnn"), scope =>
34+
{
35+
VariableScope varscope = scope;
36+
var flat_input = nest.flatten(inputs);
37+
38+
if (!time_major)
39+
{
40+
flat_input = flat_input.Select(x => ops.convert_to_tensor(x)).ToList();
41+
flat_input = flat_input.Select(x => _transpose_batch_time(x)).ToList();
42+
}
43+
44+
parallel_iterations = parallel_iterations ?? 32;
45+
46+
if (sequence_length.HasValue)
47+
throw new NotImplementedException("dynamic_rnn sequence_length has value");
48+
49+
var batch_size = _best_effort_input_batch_size(flat_input);
50+
51+
if (initial_state != null)
52+
{
53+
var state = initial_state;
54+
}
55+
else
56+
{
57+
cell.get_initial_state(batch_size: batch_size, dtype: dtype);
58+
}
59+
});
60+
61+
throw new NotImplementedException("");
62+
}
63+
64+
/// <summary>
65+
/// Transposes the batch and time dimensions of a Tensor.
66+
/// </summary>
67+
/// <param name="x"></param>
68+
/// <returns></returns>
69+
public static Tensor _transpose_batch_time(Tensor x)
70+
{
71+
var x_static_shape = x.TensorShape;
72+
if (x_static_shape.NDim == 1)
73+
return x;
74+
75+
var x_rank = array_ops.rank(x);
76+
var con1 = new object[]
77+
{
78+
new []{1, 0 },
79+
math_ops.range(2, x_rank)
80+
};
81+
var x_t = array_ops.transpose(x, array_ops.concat(con1, 0));
82+
83+
var dims = new int[] { x_static_shape.Dimensions[1], x_static_shape.Dimensions[0] }
84+
.ToList();
85+
dims.AddRange(x_static_shape.Dimensions.Skip(2));
86+
var shape = new TensorShape(dims.ToArray());
87+
88+
x_t.SetShape(shape);
89+
90+
return x_t;
91+
}
92+
93+
/// <summary>
94+
/// Get static input batch size if available, with fallback to the dynamic one.
95+
/// </summary>
96+
/// <param name="flat_input"></param>
97+
/// <returns></returns>
98+
private static Tensor _best_effort_input_batch_size(List<Tensor> flat_input)
99+
{
100+
foreach(var input_ in flat_input)
101+
{
102+
var shape = input_.TensorShape;
103+
if (shape.NDim < 0)
104+
continue;
105+
if (shape.NDim < 2)
106+
throw new ValueError($"Expected input tensor {input_.name} to have rank at least 2");
107+
108+
var batch_size = shape.Dimensions[1];
109+
if (batch_size > -1)
110+
throw new ValueError("_best_effort_input_batch_size batch_size > -1");
111+
//return batch_size;
112+
}
113+
114+
return array_ops.shape(flat_input[0]).slice(1);
115+
}
116+
}
117+
}

‎src/TensorFlowNET.Core/Operations/RNNCell.cs‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ limitations under the License.
1717
using System;
1818
using System.Collections.Generic;
1919
using System.Text;
20+
using Tensorflow.Util;
21+
using static Tensorflow.Python;
2022

2123
namespace Tensorflow
2224
{
@@ -48,6 +50,7 @@ public abstract class RNNCell : Layers.Layer
4850
/// difference between TF and Keras RNN cell.
4951
/// </summary>
5052
protected bool _is_tf_rnn_cell = false;
53+
protected virtual int state_size { get; }
5154

5255
public RNNCell(bool trainable = true,
5356
string name = null,
@@ -59,5 +62,41 @@ public RNNCell(bool trainable = true,
5962
{
6063
_is_tf_rnn_cell = true;
6164
}
65+
66+
public virtual Tensor get_initial_state(Tensor inputs = null, Tensor batch_size = null, TF_DataType dtype = TF_DataType.DtInvalid)
67+
{
68+
if (inputs != null)
69+
throw new NotImplementedException("get_initial_state input is not null");
70+
71+
return zero_state(batch_size, dtype);
72+
}
73+
74+
/// <summary>
75+
/// Return zero-filled state tensor(s).
76+
/// </summary>
77+
/// <param name="batch_size"></param>
78+
/// <param name="dtype"></param>
79+
/// <returns></returns>
80+
public Tensor zero_state(Tensor batch_size, TF_DataType dtype)
81+
{
82+
Tensor output = null;
83+
var state_size = this.state_size;
84+
with(ops.name_scope($"{this.GetType().Name}ZeroState", values: new { batch_size }), delegate
85+
{
86+
output = _zero_state_tensors(state_size, batch_size, dtype);
87+
});
88+
89+
return output;
90+
}
91+
92+
private Tensor _zero_state_tensors(int state_size, Tensor batch_size, TF_DataType dtype)
93+
{
94+
nest.map_structure(x =>
95+
{
96+
throw new NotImplementedException("");
97+
}, state_size);
98+
99+
throw new NotImplementedException("");
100+
}
62101
}
63102
}

‎src/TensorFlowNET.Core/Util/nest.py.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,14 @@ public static IEnumerable<object> map_structure(Func<object[], object> func, par
512512
return _yield_value(pack_sequence_as(structure[0], mapped_flat_structure)).ToList();
513513
}
514514

515+
public static Tensor map_structure<T>(Func<T, Tensor> func, T structure)
516+
{
517+
var flat_structure = flatten(structure);
518+
var mapped_flat_structure = flat_structure.Select(func).ToList();
519+
520+
return pack_sequence_as(structure, mapped_flat_structure) as Tensor;
521+
}
522+
515523
/// <summary>
516524
/// Same as map_structure, but with only one structure (no combining of multiple structures)
517525
/// </summary>

‎test/TensorFlowHub.Examples/TensorFlowHub.Examples.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>netcoreapp2.2</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎test/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRNN.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace TensorFlowNET.Examples.ImageProcess
3030
/// </summary>
3131
public class DigitRecognitionRNN : IExample
3232
{
33-
public bool Enabled { get; set; } = false;
33+
public bool Enabled { get; set; } = true;
3434
public bool IsImportingGraph { get; set; } = false;
3535

3636
public string Name => "MNIST RNN";
@@ -95,7 +95,7 @@ public void Train(Session sess)
9595
var init = tf.global_variables_initializer();
9696
sess.run(init);
9797

98-
float loss_val = 100.0f;
98+
float loss_val = 100.0f;
9999
float accuracy_val = 0f;
100100

101101
foreach (var epoch in range(epochs))

‎test/TensorFlowNET.Examples/Program.cs‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,36 @@ class Program
2929
{
3030
static void Main(string[] args)
3131
{
32+
int finished = 0;
3233
var errors = new List<string>();
3334
var success = new List<string>();
35+
36+
var parsedArgs = ParseArgs(args);
37+
3438
var examples = Assembly.GetEntryAssembly().GetTypes()
3539
.Where(x => x.GetInterfaces().Contains(typeof(IExample)))
3640
.Select(x => (IExample)Activator.CreateInstance(x))
3741
.Where(x => x.Enabled)
3842
.OrderBy(x => x.Name)
3943
.ToArray();
4044

45+
if (parsedArgs.ContainsKey("ex"))
46+
examples = examples.Where(x => x.Name == parsedArgs["ex"]).ToArray();
47+
4148
Console.WriteLine(Environment.OSVersion.ToString(), Color.Yellow);
4249
Console.WriteLine($"TensorFlow Binary v{tf.VERSION}", Color.Yellow);
4350
Console.WriteLine($"TensorFlow.NET v{Assembly.GetAssembly(typeof(TF_DataType)).GetName().Version}", Color.Yellow);
4451

4552
for (var i = 0; i < examples.Length; i++)
4653
Console.WriteLine($"[{i}]: {examples[i].Name}");
47-
Console.Write($"Choose one example to run, hit [Enter] to run all: ", Color.Yellow);
48-
var key = Console.ReadLine();
54+
55+
var key = "0";
56+
57+
if (examples.Length > 1)
58+
{
59+
Console.Write($"Choose one example to run, hit [Enter] to run all: ", Color.Yellow);
60+
key = Console.ReadLine();
61+
}
4962

5063
var sw = new Stopwatch();
5164
for (var i = 0; i < examples.Length; i++)
@@ -72,14 +85,35 @@ static void Main(string[] args)
7285
Console.WriteLine(ex);
7386
}
7487

88+
finished++;
7589
Console.WriteLine($"{DateTime.UtcNow} Completed {example.Name}", Color.White);
7690
}
7791

7892
success.ForEach(x => Console.WriteLine($"{x} is OK!", Color.Green));
7993
errors.ForEach(x => Console.WriteLine($"{x} is Failed!", Color.Red));
8094

81-
Console.WriteLine($"{examples.Length} examples are completed.");
95+
Console.WriteLine($"{finished} of {examples.Length} example(s) are completed.");
8296
Console.ReadLine();
8397
}
98+
99+
private static Dictionary<string, string> ParseArgs(string[] args)
100+
{
101+
var parsed = new Dictionary<string, string>();
102+
103+
for (int i = 0; i < args.Length; i++)
104+
{
105+
string key = args[i].Substring(1);
106+
switch (key)
107+
{
108+
case "ex":
109+
parsed.Add(key, args[++i]);
110+
break;
111+
default:
112+
break;
113+
}
114+
}
115+
116+
return parsed;
117+
}
84118
}
85119
}

‎test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<Compile Remove="python\**" />
11-
<EmbeddedResource Remove="python\**" />
12-
<None Remove="python\**" />
13-
</ItemGroup>
14-
159
<ItemGroup>
1610
<PackageReference Include="Colorful.Console" Version="1.2.9" />
1711
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />

0 commit comments

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