rename call to call_fn.

Oceania2018 · Oceania2018 · commit e92aa44c1d03 · 2020-10-17T21:39:19.000-05:00
diff --git a/src/TensorFlowNET.Core/Keras/ArgsDefinition/TensorFlowOpLayerArgs.cs b/src/TensorFlowNET.Core/Keras/ArgsDefinition/TensorFlowOpLayerArgs.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using NumSharp;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -7,5 +8,6 @@ namespace Tensorflow.Keras.ArgsDefinition
     public class TensorFlowOpLayerArgs : LayerArgs
     {
         public NodeDef NodeDef { get; set; }
+        public Dictionary<int, NDArray> Constants { get; set; }
     }
 }
diff --git a/src/TensorFlowNET.Core/Keras/BackendImpl.cs b/src/TensorFlowNET.Core/Keras/BackendImpl.cs
@@ -160,9 +160,9 @@ public Tensor spatial_2d_padding(Tensor x, NDArray padding = null, string data_f
         /// </summary>
         /// <param name="outputs"></param>
         /// <returns></returns>
-        public Tensor eval_in_eager_or_function(Tensor outputs)
+        public NDArray eval_in_eager_or_function(Tensor outputs)
         {
-            throw new NotImplementedException("");
+            return outputs.eval();
         }
 
         public class _DummyEagerGraph
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Flatten.cs b/src/TensorFlowNET.Core/Keras/Engine/Flatten.cs
@@ -21,7 +21,7 @@ public Flatten(FlattenArgs args)
             _channels_first = args.DataFormat == "channels_first";
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             if (_channels_first)
             {
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Functional.cs b/src/TensorFlowNET.Core/Keras/Engine/Functional.cs
@@ -69,10 +69,14 @@ void _init_graph_network(Tensors inputs, Tensors outputs)
             }
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
-            return base.call(inputs, state, is_training);
+            return run_internal_graph(inputs, state, is_training);
         }
 
+        Tensors run_internal_graph(Tensors inputs, Tensor state = null, bool is_training = false)
+        {
+            throw new NotImplementedException("");
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Layer.Apply.cs b/src/TensorFlowNET.Core/Keras/Engine/Layer.Apply.cs
@@ -46,7 +46,7 @@ public Tensors Apply(Tensors inputs, Tensor state = null, bool is_training = fal
                 if (!built)
                     MaybeBuild(inputs);
 
-                outputs = call(inputs, state: state, is_training: is_training);
+                outputs = call_fn(inputs, state: state, is_training: is_training);
 
                 outputs = _set_connectivity_metadata_(inputs, outputs);
                 _handle_activity_regularization(inputs, outputs);
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Layer.FunctionalConstructionCall.cs b/src/TensorFlowNET.Core/Keras/Engine/Layer.FunctionalConstructionCall.cs
@@ -42,7 +42,7 @@ Tensors FunctionalConstructionCall(Tensors inputs)
                 if (!dynamic)
                     throw new NotImplementedException("");
 
-                outputs = call(inputs);
+                outputs = call_fn(inputs);
 
                 outputs = _set_connectivity_metadata_(inputs, outputs);
                 _handle_activity_regularization(inputs, outputs);
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Layer.cs b/src/TensorFlowNET.Core/Keras/Engine/Layer.cs
@@ -162,7 +162,7 @@ private Tensor compute_mask(Tensor inputs, Tensor mask = null)
         /// <param name="state"></param>
         /// <param name="is_training"></param>
         /// <returns></returns>
-        protected virtual Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected virtual Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             throw new NotImplementedException("");
         }
diff --git a/src/TensorFlowNET.Core/Keras/Engine/Node.cs b/src/TensorFlowNET.Core/Keras/Engine/Node.cs
@@ -52,8 +52,6 @@ public Node(Layer layer, NodeArgs args)
             layer.InboundNodes.Add(this);
             foreach (var kt in kerasInputs)
             {
-                if (kt.KerasHistory == null)
-                    continue;
                 var inbound_layer = kt.KerasHistory.layer;
                 if (inbound_layer != null)
                     inbound_layer.OutboundNodes.Add(this);
diff --git a/src/TensorFlowNET.Core/Keras/Engine/TensorFlowOpLayer.cs b/src/TensorFlowNET.Core/Keras/Engine/TensorFlowOpLayer.cs
@@ -23,9 +23,9 @@ public TensorFlowOpLayer(TensorFlowOpLayerArgs args)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
-            return base.call(inputs, state, is_training);
+            return base.call_fn(inputs, state, is_training);
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/Keras/Layers/BatchNormalization.cs b/src/TensorFlowNET.Core/Keras/Layers/BatchNormalization.cs
@@ -119,7 +119,7 @@ protected override void build(TensorShape input_shape)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             Tensor outputs = null;
 
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Convolutional.cs b/src/TensorFlowNET.Core/Keras/Layers/Convolutional.cs
@@ -98,7 +98,7 @@ protected override void build(TensorShape input_shape)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool training = false)
         {
             var outputs = _convolution_op.Apply(inputs, kernel);
             if (use_bias)
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Dense.cs b/src/TensorFlowNET.Core/Keras/Layers/Dense.cs
@@ -65,7 +65,7 @@ protected override void build(TensorShape input_shape)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool training = false)
         {
             Tensor outputs = null;
             var rank = inputs.rank;
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Dropout.cs b/src/TensorFlowNET.Core/Keras/Layers/Dropout.cs
@@ -18,7 +18,7 @@ public Dropout(DropoutArgs args)
             this.args = args;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             var output = tf_utils.smart_cond(is_training,
                 () => tf.nn.dropout(inputs,
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Embedding.cs b/src/TensorFlowNET.Core/Keras/Layers/Embedding.cs
@@ -62,7 +62,7 @@ protected override void build(TensorShape input_shape)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             var dtype = inputs.dtype;
             if (dtype != tf.int32 && dtype != tf.int64)
diff --git a/src/TensorFlowNET.Core/Keras/Layers/LSTM.cs b/src/TensorFlowNET.Core/Keras/Layers/LSTM.cs
@@ -29,9 +29,9 @@ public LSTM(LSTMArgs args) :
                 .ToArray();
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
-            return base.call(inputs, state: state, is_training: is_training);
+            return base.call_fn(inputs, state: state, is_training: is_training);
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Pooling2D.cs b/src/TensorFlowNET.Core/Keras/Layers/Pooling2D.cs
@@ -36,7 +36,7 @@ public Pooling2D(Pooling2DArgs args)
             input_spec = new InputSpec(ndim: 4);
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             int[] pool_shape;
             int[] strides;
diff --git a/src/TensorFlowNET.Core/Keras/Layers/Rescaling.cs b/src/TensorFlowNET.Core/Keras/Layers/Rescaling.cs
@@ -20,7 +20,7 @@ public Rescaling(RescalingArgs args) : base(args)
             this.args = args;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             scale = math_ops.cast(args.Scale, args.DType);
             offset = math_ops.cast(args.Offset, args.DType);
diff --git a/src/TensorFlowNET.Core/Keras/Layers/ZeroPadding2D.cs b/src/TensorFlowNET.Core/Keras/Layers/ZeroPadding2D.cs
@@ -29,7 +29,7 @@ public ZeroPadding2D(ZeroPadding2DArgs args, string data_format = null)
             this.input_spec = new InputSpec(ndim: 4);
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             return tf.keras.backend.spatial_2d_padding(inputs,
                 padding: padding,
diff --git a/src/TensorFlowNET.Core/Keras/Utils/base_layer_utils.cs b/src/TensorFlowNET.Core/Keras/Utils/base_layer_utils.cs
@@ -14,6 +14,7 @@ You may obtain a copy of the License at
    limitations under the License.
 ******************************************************************************/
 
+using NumSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -135,7 +136,7 @@ public static void CreateKerasHistoryHelper(Tensors tensors, List<Operation> pro
                 if (!processed_ops.Contains(op))
                 {
                     var layer_inputs = new List<Tensor>();
-
+                    var constants = new Dictionary<int, NDArray>();
                     foreach (var (i, op_input) in enumerate(op.inputs._inputs))
                     {
                         if (uses_keras_history(op_input))
@@ -144,8 +145,7 @@ public static void CreateKerasHistoryHelper(Tensors tensors, List<Operation> pro
                         {
                             tf_with(ops.init_scope(), delegate
                             {
-
-
+                                constants[i] = tf.keras.backend.eval_in_eager_or_function(op_input);
                             });
                         }
                     }
@@ -155,6 +155,7 @@ public static void CreateKerasHistoryHelper(Tensors tensors, List<Operation> pro
                     var op_layer = new TensorFlowOpLayer(new TensorFlowOpLayerArgs
                     {
                         NodeDef = op.node_def,
+                        Constants = constants,
                         Name = op.name
                     });
                     created_layers.Add(op_layer);
diff --git a/src/TensorFlowNET.Core/Operations/NnOps/BasicLSTMCell.cs b/src/TensorFlowNET.Core/Operations/NnOps/BasicLSTMCell.cs
@@ -74,7 +74,7 @@ public Tensor __call__(Tensor inputs, LSTMStateTuple state)
         /// <param name="training"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             var one = constant_op.constant(1, dtype: dtypes.int32);
             // Parameters of gates are concatenated into one multiply for efficiency.
diff --git a/src/TensorFlowNET.Core/Operations/NnOps/BasicRNNCell.cs b/src/TensorFlowNET.Core/Operations/NnOps/BasicRNNCell.cs
@@ -67,7 +67,7 @@ protected override void build(TensorShape inputs_shape)
             built = true;
         }
 
-        protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)
+        protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)
         {
             // Most basic RNN: output = new_state = act(W * input + U * state + B).
             var concat = array_ops.concat(new Tensor[] { inputs, state }, 1);
diff --git a/src/TensorFlowNET.Core/Sessions/_FetchHandler.cs b/src/TensorFlowNET.Core/Sessions/_FetchHandler.cs
@@ -124,6 +124,9 @@ public NDArray[] build_results(BaseSession session, NDArray[] tensor_values)
                             case NPTypeCode.Double:
                                 full_values.Add(value.GetValue<double>(0));
                                 break;
+                            case NPTypeCode.Boolean:
+                                full_values.Add(value.GetValue<bool>(0));
+                                break;
                             /*case "String":
                                 full_values.Add(value.Data<byte>()[0]);
                                 break;*/
diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj
@@ -72,6 +72,8 @@ https://tensorflownet.readthedocs.io</Description>
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="FodyWeavers.xml" />
+    <None Remove="FodyWeavers.xsd" />
     <None Remove="Protobuf\README.md" />
   </ItemGroup>
 
@@ -84,10 +86,4 @@ https://tensorflownet.readthedocs.io</Description>
   <ItemGroup>
     <Folder Include="Keras\Initializers\" />
   </ItemGroup>
-
-  <ItemGroup>
-    <None Update="FodyWeavers.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using NumSharp;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.Text;`
`4`	`5`
`@@ -7,5 +8,6 @@ namespace Tensorflow.Keras.ArgsDefinition`
`7`	`8`	`public class TensorFlowOpLayerArgs : LayerArgs`
`8`	`9`	`{`
`9`	`10`	`public NodeDef NodeDef { get; set; }`
	`11`	`+ public Dictionary<int, NDArray> Constants { get; set; }`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,9 +160,9 @@ public Tensor spatial_2d_padding(Tensor x, NDArray padding = null, string data_f`
`160`	`160`	`/// </summary>`
`161`	`161`	`/// <param name="outputs"></param>`
`162`	`162`	`/// <returns></returns>`
`163`		`- public Tensor eval_in_eager_or_function(Tensor outputs)`
	`163`	`+ public NDArray eval_in_eager_or_function(Tensor outputs)`
`164`	`164`	`{`
`165`		`- throw new NotImplementedException("");`
	`165`	`+ return outputs.eval();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`public class _DummyEagerGraph`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public Flatten(FlattenArgs args)`
`21`	`21`	`_channels_first = args.DataFormat == "channels_first";`
`22`	`22`	`}`
`23`	`23`
`24`		`- protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)`
	`24`	`+ protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)`
`25`	`25`	`{`
`26`	`26`	`if (_channels_first)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,14 @@ void _init_graph_network(Tensors inputs, Tensors outputs)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)`
	`72`	`+ protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)`
`73`	`73`	`{`
`74`		`- return base.call(inputs, state, is_training);`
	`74`	`+ return run_internal_graph(inputs, state, is_training);`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ Tensors run_internal_graph(Tensors inputs, Tensor state = null, bool is_training = false)`
	`78`	`+ {`
	`79`	`+ throw new NotImplementedException("");`
	`80`	`+ }`
`77`	`81`	`}`
`78`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private Tensor compute_mask(Tensor inputs, Tensor mask = null)`
`162`	`162`	`/// <param name="state"></param>`
`163`	`163`	`/// <param name="is_training"></param>`
`164`	`164`	`/// <returns></returns>`
`165`		`- protected virtual Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)`
	`165`	`+ protected virtual Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)`
`166`	`166`	`{`
`167`	`167`	`throw new NotImplementedException("");`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ public Node(Layer layer, NodeArgs args)`
`52`	`52`	`layer.InboundNodes.Add(this);`
`53`	`53`	`foreach (var kt in kerasInputs)`
`54`	`54`	`{`
`55`		`- if (kt.KerasHistory == null)`
`56`		`- continue;`
`57`	`55`	`var inbound_layer = kt.KerasHistory.layer;`
`58`	`56`	`if (inbound_layer != null)`
`59`	`57`	`inbound_layer.OutboundNodes.Add(this);`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ public TensorFlowOpLayer(TensorFlowOpLayerArgs args)`
`23`	`23`	`built = true;`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)`
	`26`	`+ protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)`
`27`	`27`	`{`
`28`		`- return base.call(inputs, state, is_training);`
	`28`	`+ return base.call_fn(inputs, state, is_training);`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected override void build(TensorShape input_shape)`
`119`	`119`	`built = true;`
`120`	`120`	`}`
`121`	`121`
`122`		`- protected override Tensors call(Tensors inputs, Tensor state = null, bool is_training = false)`
	`122`	`+ protected override Tensors call_fn(Tensors inputs, Tensor state = null, bool is_training = false)`
`123`	`123`	`{`
`124`	`124`	`Tensor outputs = null;`
`125`	`125`