Remove _isCreatedInGraphMode in Tensor

Author: Oceania2018

src/TensorFlowNET.Core/Functions/TapeGradientFunctions.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Tensorflow.Eager;
 using Tensorflow.Graphs;
+using Tensorflow.NumPy;
 using static Tensorflow.Binding;
 using static Tensorflow.tensorflow;
 
@@ -148,7 +150,7 @@ public void Record(Tensors flat_outputs, Tensors inference_args)
                 src_graph: _func_graph);
 
             var captures_from_forward = backwards_graph.external_captures
-                .Where(x => x.IsCreatedInGraphMode && x.graph == _func_graph)
+                .Where(x => x is not EagerTensor && x is not NDArray && x.graph == _func_graph)
                 .ToArray();
             foreach(var capture in captures_from_forward)
             {

src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs

@@ -32,7 +32,6 @@ public partial class Tensor
 
         public Tensor()
         {
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         /// <summary>
@@ -44,8 +43,6 @@ public unsafe Tensor(SafeTensorHandle handle, bool clone = false)
             _handle = handle;
             if (clone && handle != null)
                 _handle = TF_NewTensor(shape, dtype, data: TensorDataPointer.ToPointer());
-                
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         /// <summary>
@@ -59,13 +56,11 @@ public unsafe Tensor(SafeTensorHandle handle, bool clone = false)
         public unsafe Tensor(IntPtr data_ptr, Shape shape, TF_DataType dtype)
         {
             _handle = TF_NewTensor(shape, dtype, data: data_ptr.ToPointer());
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         public unsafe Tensor(NDArray nd)
         {
             _handle = TF_NewTensor(nd.shape, nd.dtype, nd.data.ToPointer());
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         #region scala
@@ -107,13 +102,11 @@ public Tensor(Operation op, int value_index, TF_DataType dtype)
             _value_index = value_index;
             _override_dtype = dtype;
             _id = ops.uid();
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         protected unsafe void InitTensor(Shape shape, TF_DataType dtype)
         {
             _handle = TF_NewTensor(shape, dtype, null);
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         protected unsafe void InitTensor(Shape shape, byte[] bytes, TF_DataType dtype)
@@ -122,13 +115,10 @@ protected unsafe void InitTensor(Shape shape, byte[] bytes, TF_DataType dtype)
                 _handle = StringTensor(new byte[][] { bytes }, Shape.Scalar);
             else
                 _handle = TF_NewTensor(bytes, shape, dtype);
-            _isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
         protected unsafe void InitTensor(Array array, Shape? shape = null)
         {
-            _isCreatedInGraphMode = !tf.executing_eagerly();
-
             shape = shape ?? array.GetShape();
             var dtype = array.GetDataType();
 

src/TensorFlowNET.Core/Tensors/Tensor.cs

@@ -94,10 +94,6 @@ public partial class Tensor : DisposableObject,
         /// </summary>
         public SafeEagerTensorHandle EagerTensorHandle => _eagerTensorHandle;
 
-        protected bool _isCreatedInGraphMode;
-        
-        public bool IsCreatedInGraphMode => _isCreatedInGraphMode;
-
         /// <summary>
         ///     Returns the shape of a tensor.
         /// </summary>

src/TensorFlowNET.Core/Tensors/Tensors.cs

@@ -21,7 +21,6 @@ public class Tensors : IEnumerable<Tensor>, IDisposable
         public Shape shape => items.First().shape;
         public int rank => items.First().rank;
         public Graph graph => items.First().graph;
-        public bool IsCreatedInGraphMode => items.First().IsCreatedInGraphMode;
         public bool IsList { get; set; }
         public int Length => items.Count();
 

src/TensorFlowNET.Core/Variables/BaseResourceVariable.cs

@@ -68,7 +68,7 @@ public void __init__(bool trainable = true,
             // when this object is garbage collected the deleter will be too. This
             // means ResourceVariables can be part of reference cycles without those
             // cycles being uncollectable.
-            if (!handle.IsCreatedInGraphMode)
+            if (handle is EagerTensor)
             {
                 _handle = handle.EagerTensorHandle.DangerousGetHandle();
                 eager_resource_deleter = new EagerResourceDeleter(handle, handle.Device);

src/TensorFlowNET.Keras/Engine/Layer.cs

@@ -18,9 +18,11 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using Tensorflow.Eager;
 using Tensorflow.Keras.ArgsDefinition;
 using Tensorflow.Keras.Saving;
 using Tensorflow.Keras.Utils;
+using Tensorflow.NumPy;
 using Tensorflow.Train;
 using static Tensorflow.Binding;
 
@@ -118,7 +120,7 @@ public Layer(LayerArgs args)
         bool _in_functional_construction_mode(Tensors inputs)
         {
             return tf.Context.executing_eagerly()
-                && inputs.Count(x => x.IsCreatedInGraphMode) == inputs.Count();
+                && inputs.Count(x => x is not EagerTensor && x is not NDArray) == inputs.Count();
         }
 
         public void SetConnectivityMetadata(Tensors inputs, Tensors outputs)
@@ -180,7 +182,7 @@ protected void MaybeBuild(Tensors inputs)
             tf.init_scope();
 
             bool need_restore_mode = false;
-            if (!inputs.IsCreatedInGraphMode || tf.Context.is_build_function())
+            if (inputs.Any(x => x is EagerTensor) || tf.Context.is_build_function())
             {
                 need_restore_mode = true;
                 tf.Context.eager_mode(isFunc: tf.Context.is_build_function());