tf.while_loop, add ICanBeFlattened #348

Author: Oceania2018

src/TensorFlowNET.Core/Operations/ControlFlows/LoopVar.cs

@@ -4,22 +4,25 @@
 
 namespace Tensorflow.Operations
 {
-    internal class LoopVar<TItem>
+    internal class LoopVar<TItem> : ICanBeFlattened
     {
         public Tensor Counter { get; }
-        public TItem[] Items { get; }
         public TItem Item { get; }
 
-        public LoopVar(Tensor counter, TItem[] items)
+        public LoopVar(Tensor counter, TItem item)
         {
             Counter = counter;
-            Items = items;
+            Item = item;
         }
 
-        public LoopVar(Tensor counter, TItem item)
+        public object[] Flatten()
         {
-            Counter = counter;
-            Item = item;
+            var elements = new List<object> { Counter };
+            if (typeof(TItem).GetInterface(typeof(ICanBeFlattened).Name) != null)
+                elements.AddRange((Item as ICanBeFlattened).Flatten());
+            else
+                elements.Add(Item);
+            return elements.ToArray();
         }
     }
 }

src/TensorFlowNET.Core/Operations/ControlFlows/WhileContext.cs

@@ -109,7 +109,7 @@ private void _init_from_proto(WhileContextDef context_def, string import_scope =
         /// </summary>
         internal Tensor[] BuildLoop<TItem>(Func<Tensor, TItem, Tensor> pred, 
             Func<Tensor, TItem, LoopVar<TItem>> body,
-            TItem loop_vars,
+            LoopVar<TItem> loop_vars,
             TensorShape shape_invariants,
             bool return_same_structure)
         {
@@ -143,16 +143,16 @@ private Tensor _convert_tensorarray_to_flow<TItem>(TItem tensor_or_tensor_array)
 
         private (Tensor[], Tensor[]) _BuildLoop<TItem>(Func<Tensor, TItem, Tensor> pred,
             Func<Tensor, TItem, LoopVar<TItem>> body,
-            TItem original_loop_vars,
-            TItem loop_vars,
+            LoopVar<TItem> original_loop_vars,
+            LoopVar<TItem> loop_vars,
             TensorShape shape_invariants)
         {
             var flat_loop_vars = original_loop_vars;
 
             // Convert TensorArrays to their flow variables
             var loop_vars_tensor = nest.map_structure(
                 _convert_tensorarray_to_flow,
-                nest.flatten(loop_vars));
+                nest.flatten2(loop_vars));
 
             // Let the context know the loop variables so the loop variables
             // would be added in the outer contexts properly.

src/TensorFlowNET.Core/Operations/IFlatten.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tensorflow.Operations
+{
+    public interface ICanBeFlattened
+    {
+        object[] Flatten();
+    }
+}

src/TensorFlowNET.Core/Operations/NnOps/BodyItemInRnnWhileLoop.cs

@@ -4,7 +4,7 @@
 
 namespace Tensorflow.Operations
 {
-    internal class BodyItemInRnnWhileLoop
+    internal class BodyItemInRnnWhileLoop : ICanBeFlattened
     {
         /// <summary>
         /// int32 scalar Tensor.
@@ -28,5 +28,13 @@ public BodyItemInRnnWhileLoop(Tensor time, TensorArray[] output_ta_t, Tensor sta
 
         public static implicit operator (Tensor, TensorArray[], Tensor)(BodyItemInRnnWhileLoop item)
             => (item.time, item.output_ta_t, item.state);
+
+        public object[] Flatten()
+        {
+            var elements = new List<object> { time };
+            elements.AddRange(output_ta_t);
+            elements.Add(state);
+            return elements.ToArray();
+        }
     }
 }

src/TensorFlowNET.Core/Operations/control_flow_ops.cs

@@ -642,7 +642,7 @@ public static Tensor while_loop<TItem>(Func<TItem, Tensor> cond, Func<TItem, TIt
                 if (loop_context.outer_context == null)
                     ops.add_to_collection(tf.GraphKeys.WHILE_CONTEXT, loop_context);
 
-                var results = loop_context.BuildLoop(cond_buildloop, body_buildloop, loop_vars, shape_invariants,
+                var results = loop_context.BuildLoop(cond_buildloop, body_buildloop, loop_vars_1, shape_invariants,
                                     return_same_structure);
 
                 if (maximum_iterations != null)

src/TensorFlowNET.Core/TensorFlowNET.Core.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>TensorFlow.NET</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>1.14.0</TargetTensorFlow>
-    <Version>0.11.8.1</Version>
+    <Version>0.12.0</Version>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</Authors>
     <Company>SciSharp STACK</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -16,25 +16,13 @@
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/44989469?s=200&amp;v=4</PackageIconUrl>
     <PackageTags>TensorFlow, NumSharp, SciSharp, MachineLearning, TensorFlow.NET, C#</PackageTags>
     <Description>Google's TensorFlow full binding in .NET Standard.
-Docs: https://tensorflownet.readthedocs.io</Description>
-    <AssemblyVersion>0.11.8.1</AssemblyVersion>
-    <PackageReleaseNotes>Changes since v0.10.0:
-1. Upgrade NumSharp to v0.20.3.
-2. Add DisposableObject class to manage object lifetime.
-3. Add tf.no_op, tf.nn.in_top_k, tf.GraphKeys and tf.trainable_variables.
-4. Change tensorflow to non-static class in order to execute some initialization process.
-5. Overload session.run(), make syntax simpler.
-6. Add Local Response Normalization.
-7. Add tf.image related APIs.
-8. Add tf.random_normal, tf.constant, tf.pad, tf.shape, tf.image.resize_nearest_neighbor.
-9. MultiThread is safe.
-10. Support n-dim indexing for tensor.
-11. Add RegisterNoGradients
-12. Add CumsumGrad, BroadcastToGrad.
-13. Return VariableV1 instead of RefVariable.
-14. Add Tensor overload to GradientDescentOptimizer.</PackageReleaseNotes>
+Building, training and infering deep learning models.
+https://tensorflownet.readthedocs.io</Description>
+    <AssemblyVersion>0.12.0.0</AssemblyVersion>
+    <PackageReleaseNotes>Changes since v0.11.0:
+</PackageReleaseNotes>
     <LangVersion>7.3</LangVersion>
-    <FileVersion>0.11.8.1</FileVersion>
+    <FileVersion>0.12.0.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>

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

@@ -19,6 +19,7 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Linq;
 using NumSharp;
+using Tensorflow.Operations;
 
 namespace Tensorflow.Util
 {
@@ -221,6 +222,11 @@ public static List<T> flatten<T>(T structure)
             return list;
         }
 
+        public static object[] flatten2(ICanBeFlattened structure)
+        {
+            return structure.Flatten();
+        }
+
         private static void _flatten_recursive<T>(T obj, List<T> list)
         {
             switch(obj)