remove TF_DeleteTensor in test.

Oceania2018 · Oceania2018 · commit 795c28652d2c · 2021-07-18T22:26:49.000-05:00
diff --git a/src/TensorFlowNET.Core/NumPy/NDArray.Index.cs b/src/TensorFlowNET.Core/NumPy/NDArray.Index.cs
@@ -62,8 +62,14 @@ NDArray GetData(IEnumerable<Slice> slices)
 
             var tensor = base[slices.ToArray()];
             if (tensor.Handle == null)
-                tensor = tf.defaultSession.eval(tensor);
-            return new NDArray(tensor.Handle);
+            {
+                if (tf.executing_eagerly())
+                    return new NDArray(tensor);
+                else
+                    tensor = tf.defaultSession.eval(tensor);
+            }
+                
+            return new NDArray(tensor);
         }
 
         unsafe T GetAtIndex<T>(params int[] indices) where T : unmanaged
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -97,9 +97,6 @@ public partial class Tensor : DisposableObject,
         /// </summary>
         public SafeTensorHandleHandle EagerTensorHandle => _eagerTensorHandle;
 
-        protected bool isReferencedByNDArray;
-        public bool IsReferencedByNDArray => isReferencedByNDArray;
-
         protected bool isCreatedInGraphMode;
         
         public bool IsCreatedInGraphMode => isCreatedInGraphMode;
@@ -214,15 +211,6 @@ public TF_Output _as_tf_output()
 
             return _tf_output.Value;
         }
-
-        public void SetReferencedByNDArray() 
-        {
-            if (_handle is not null)
-            {
-                isReferencedByNDArray = true;
-                _eagerTensorHandle = c_api.TFE_NewTensorHandle(_handle, tf.Status.Handle);
-            }
-        }
         
         public Tensor MaybeMove()
         {
diff --git a/src/TensorFlowNET.Core/Tensors/tensor_util.cs b/src/TensorFlowNET.Core/Tensors/tensor_util.cs
@@ -141,12 +141,6 @@ public static TensorProto make_tensor_proto(object values, TF_DataType dtype = T
                 byte[] bytes = nd.ToByteArray();
                 tensor_proto.TensorContent = Google.Protobuf.ByteString.CopyFrom(bytes);
             }
-            else if (values is Tensor tensor && tensor.IsReferencedByNDArray)
-            {
-                var len = tensor.dtypesize * tensor.size;
-                byte[] bytes = tensor.BufferToArray();
-                tensor_proto.TensorContent = Google.Protobuf.ByteString.CopyFrom(bytes);
-            }
             else if (!values.GetType().IsArray)
             {
                 switch (values)
diff --git a/src/TensorFlowNET.Core/ops.cs b/src/TensorFlowNET.Core/ops.cs
@@ -149,13 +149,6 @@ public static Tensor convert_to_tensor(object value,
                 else
                     return constant_op.constant(nd);
             }
-            else if (value is Tensor tensor && tensor.IsReferencedByNDArray)
-            {
-                if (tf.executing_eagerly())
-                    return tensor;
-                else
-                    return constant_op.constant(tensor);
-            }
 
             // graph mode
             Tensor ret = value switch
diff --git a/src/TensorFlowNet.Benchmarks/Leak/GpuLeakByCNN.cs b/src/TensorFlowNet.Benchmarks/Leak/GpuLeakByCNN.cs
@@ -50,7 +50,7 @@ public void Run()
              optimizer: keras.optimizers.RMSprop(),
              metrics: new[] { "accuracy" });
 
-            model.fit(new NDArray(inputImages), outLables, batch_size: 32, epochs: 200);
+            model.fit(inputImages, outLables, batch_size: 32, epochs: 200);
 
             keras.backend.clear_session();
         }
diff --git a/test/TensorFlowNET.Native.UnitTest/CApiTest.cs b/test/TensorFlowNET.Native.UnitTest/CApiTest.cs
@@ -74,9 +74,6 @@ protected static string TF_Message(SafeStatusHandle s)
         protected SafeStatusHandle TF_NewStatus()
             => c_api.TF_NewStatus();
 
-        protected void TF_DeleteTensor(SafeTensorHandle t)
-            => c_api.TF_DeleteTensor(t.DangerousGetHandle());
-
         protected IntPtr TF_TensorData(SafeTensorHandle t)
             => c_api.TF_TensorData(t);
 
diff --git a/test/TensorFlowNET.Native.UnitTest/Eager/Eager.Execute_MatMul_CPU.cs b/test/TensorFlowNET.Native.UnitTest/Eager/Eager.Execute_MatMul_CPU.cs
@@ -58,7 +58,7 @@ static SafeContextHandle NewContext(bool async, SafeStatusHandle status)
             EXPECT_EQ(product.Length * sizeof(float), (int)TF_TensorByteSize(t));
             tf.memcpy(product, TF_TensorData(t), TF_TensorByteSize(t));
 
-            c_api.TF_DeleteTensor(t.DangerousGetHandle());
+            t.Dispose();
             EXPECT_EQ(7f, product[0]);
             EXPECT_EQ(10f, product[1]);
             EXPECT_EQ(15f, product[2]);
diff --git a/test/TensorFlowNET.Native.UnitTest/Eager/Eager.TensorHandle.cs b/test/TensorFlowNET.Native.UnitTest/Eager/Eager.TensorHandle.cs
@@ -25,7 +25,7 @@ public unsafe void TensorHandle()
             EXPECT_EQ(2.0f, data[1]);
             EXPECT_EQ(3.0f, data[2]);
             EXPECT_EQ(4.0f, data[3]);
-            c_api.TF_DeleteTensor(t.DangerousGetHandle());
+            t.Dispose();
         }
     }
 }
diff --git a/test/TensorFlowNET.Native.UnitTest/Eager/Eager.Variables.cs b/test/TensorFlowNET.Native.UnitTest/Eager/Eager.Variables.cs
@@ -51,7 +51,7 @@ static SafeContextHandle NewContext(SafeStatusHandle status)
                     ASSERT_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
                     ASSERT_EQ(sizeof(float), (int)TF_TensorByteSize(t));
                     tf.memcpy(&value, TF_TensorData(t).ToPointer(), sizeof(float));
-                    c_api.TF_DeleteTensor(t.DangerousGetHandle());
+                    t.Dispose();
                     EXPECT_EQ(12.0f, value);
                 }
                 finally
diff --git a/test/TensorFlowNET.Native.UnitTest/Eager/Eager.cs b/test/TensorFlowNET.Native.UnitTest/Eager/Eager.cs
@@ -21,7 +21,7 @@ SafeTensorHandleHandle TestMatrixTensorHandle()
             using var status = c_api.TF_NewStatus();
             var th = c_api.TFE_NewTensorHandle(t, status);
             CHECK_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
-            c_api.TF_DeleteTensor(t.DangerousGetHandle());
+            t.Dispose();
             return th;
         }
 
@@ -127,7 +127,7 @@ SafeTensorHandleHandle TestAxisTensorHandle()
             using var status = TF_NewStatus();
             var th = c_api.TFE_NewTensorHandle(t, status);
             CHECK_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
-            TF_DeleteTensor(t);
+            t.Dispose();
             return th;
         }
 
@@ -139,7 +139,7 @@ SafeTensorHandleHandle TestScalarTensorHandle(bool value)
             using var status = TF_NewStatus();
             var th = TFE_NewTensorHandle(t, status);
             CHECK_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
-            TF_DeleteTensor(t);
+            t.Dispose();
             return th;
         }
 
@@ -151,7 +151,7 @@ SafeTensorHandleHandle TestScalarTensorHandle(float value)
             using var status = TF_NewStatus();
             var th = TFE_NewTensorHandle(t, status);
             CHECK_EQ(TF_OK, TF_GetCode(status), TF_Message(status));
-            TF_DeleteTensor(t);
+            t.Dispose();
             return th;
         }
     }
diff --git a/test/TensorFlowNET.Native.UnitTest/Sessions/CSession.cs b/test/TensorFlowNET.Native.UnitTest/Sessions/CSession.cs
@@ -64,7 +64,7 @@ public void SetOutputs(TF_Output[] outputs)
             foreach (var output in outputs)
             {
                 outputs_.Add(output);
-                output_values_.Add(new SafeTensorHandle(IntPtr.Zero));
+                output_values_.Add(null);
             }
         }
 
diff --git a/test/TensorFlowNET.Native.UnitTest/Tensors/TensorTest.cs b/test/TensorFlowNET.Native.UnitTest/Tensors/TensorTest.cs
@@ -39,24 +39,18 @@ public unsafe void TensorFromFixed()
         public void TensorFromArray()
         {
             var array = new float[1000];
-            /*using (var t = new Tensor(array, new long[] { array.Length }, tf.float32))
+            using (var t = new Tensor(array))
             {
                 Assert.IsFalse(t.IsDisposed);
                 Assert.AreEqual(1000 * sizeof(float), (int)t.bytesize);
             }
 
-            using (var t = new Tensor(new float[] { 1 }, new long[] { 1 }, tf.float32))
+            using (var t = new Tensor(1))
             {
                 Assert.IsFalse(t.IsDisposed);
                 Assert.AreEqual(1 * sizeof(float), (int)t.bytesize);
+                Assert.AreEqual(t.shape, Shape.Scalar);
             }
-
-            using (var t = new Tensor(new float[] { 1 }, null, tf.float32))
-            {
-                Assert.IsFalse(t.IsDisposed);
-                Assert.AreEqual(1 * sizeof(float), (int)t.bytesize);
-                t.shape.Should().BeEmpty();
-            }*/
         }
 
         [TestMethod]
@@ -80,8 +74,7 @@ public void AllocateTensor()
         [TestMethod, Ignore]
         public void MaybeMove()
         {
-            NDArray nd = np.array(2, 3);
-            Tensor t = new Tensor(nd);
+            Tensor t = new Tensor(new[] { 2, 3 });
             Tensor o = t.MaybeMove();
             ASSERT_TRUE(o.Handle.IsInvalid); // It is unsafe to move memory TF might not own.
             t.Dispose();
@@ -94,17 +87,15 @@ public void MaybeMove()
         [TestMethod]
         public void Tensor()
         {
-            var nd = np.array(1f, 2f, 3f, 4f, 5f, 6f).reshape((2, 3));
-
-            var tensor = new Tensor(nd);
-            var array = tensor.ToArray<float>();
+            var array = new[] { 1f, 2f, 3f, 4f, 5f, 6f };
+            var tensor = new Tensor(array, (2, 3));
 
             EXPECT_EQ(tensor.dtype, TF_DataType.TF_FLOAT);
-            EXPECT_EQ(tensor.rank, nd.ndim);
-            EXPECT_EQ(tensor.shape[0], nd.dims[0]);
-            EXPECT_EQ(tensor.shape[1], nd.dims[1]);
-            EXPECT_EQ(tensor.bytesize, nd.size * sizeof(float));
-            Assert.IsTrue(Enumerable.SequenceEqual(nd.ToArray<float>(), new float[] { 1, 2, 3, 4, 5, 6 }));
+            EXPECT_EQ(tensor.rank, 2);
+            EXPECT_EQ(tensor.shape[0], 2L);
+            EXPECT_EQ(tensor.shape[1], 3L);
+            EXPECT_EQ(tensor.bytesize, 6ul * sizeof(float));
+            Assert.IsTrue(Enumerable.SequenceEqual(tensor.ToArray<float>(), new float[] { 1, 2, 3, 4, 5, 6 }));
         }
 
         /// <summary>
@@ -130,7 +121,7 @@ public void StringTensor()
             Assert.AreEqual(TF_TString_Type.TF_TSTR_SMALL, c_api.TF_StringGetType(tensor));
             Assert.AreEqual(0, c_api.TF_NumDims(tensor));
 
-            TF_DeleteTensor(tensor);
+            tensor.Dispose();
             c_api.TF_StringDealloc(tstr);
         }
 
diff --git a/test/TensorFlowNET.UnitTest/PythonTest.cs b/test/TensorFlowNET.UnitTest/PythonTest.cs
@@ -141,7 +141,7 @@ public void assertAllClose(NDArray array1, NDArray array2, double eps = 1e-5)
         public void assertAllClose(double value, NDArray array2, double eps = 1e-5)
         {
             var array1 = np.ones_like(array2) * value;
-            Assert.IsTrue(np.allclose(new NDArray(array1), array2, rtol: eps));
+            Assert.IsTrue(np.allclose(array1, array2, rtol: eps));
         }
 
         public void assertProtoEquals(object toProto, object o)

Original file line number	Diff line number	Diff line change
`@@ -141,12 +141,6 @@ public static TensorProto make_tensor_proto(object values, TF_DataType dtype = T`
`141`	`141`	`byte[] bytes = nd.ToByteArray();`
`142`	`142`	`tensor_proto.TensorContent = Google.Protobuf.ByteString.CopyFrom(bytes);`
`143`	`143`	`}`
`144`		`- else if (values is Tensor tensor && tensor.IsReferencedByNDArray)`
`145`		`- {`
`146`		`- var len = tensor.dtypesize * tensor.size;`
`147`		`- byte[] bytes = tensor.BufferToArray();`
`148`		`- tensor_proto.TensorContent = Google.Protobuf.ByteString.CopyFrom(bytes);`
`149`		`- }`
`150`	`144`	`else if (!values.GetType().IsArray)`
`151`	`145`	`{`
`152`	`146`	`switch (values)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void Run()`
`50`	`50`	`optimizer: keras.optimizers.RMSprop(),`
`51`	`51`	`metrics: new[] { "accuracy" });`
`52`	`52`
`53`		`- model.fit(new NDArray(inputImages), outLables, batch_size: 32, epochs: 200);`
	`53`	`+ model.fit(inputImages, outLables, batch_size: 32, epochs: 200);`
`54`	`54`
`55`	`55`	`keras.backend.clear_session();`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public unsafe void TensorHandle()`
`25`	`25`	`EXPECT_EQ(2.0f, data[1]);`
`26`	`26`	`EXPECT_EQ(3.0f, data[2]);`
`27`	`27`	`EXPECT_EQ(4.0f, data[3]);`
`28`		`- c_api.TF_DeleteTensor(t.DangerousGetHandle());`
	`28`	`+ t.Dispose();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static SafeContextHandle NewContext(SafeStatusHandle status)`
`51`	`51`	`ASSERT_EQ(TF_OK, TF_GetCode(status), TF_Message(status));`
`52`	`52`	`ASSERT_EQ(sizeof(float), (int)TF_TensorByteSize(t));`
`53`	`53`	`tf.memcpy(&value, TF_TensorData(t).ToPointer(), sizeof(float));`
`54`		`- c_api.TF_DeleteTensor(t.DangerousGetHandle());`
	`54`	`+ t.Dispose();`
`55`	`55`	`EXPECT_EQ(12.0f, value);`
`56`	`56`	`}`
`57`	`57`	`finally`