Tensor: dispose Tensors that have been garbage collected (thread safe) + test

henon · henon · commit b2a9a989afdf · 2019-07-13T22:33:11.000+02:00
diff --git a/src/TensorFlowNET.Core/Status/Status.cs b/src/TensorFlowNET.Core/Status/Status.cs
@@ -26,7 +26,7 @@ namespace Tensorflow
     /// </summary>
     public class Status : IDisposable
     {
-        protected readonly IntPtr _handle;
+        protected IntPtr _handle;
 
         /// <summary>
         /// Error message
@@ -71,7 +71,20 @@ public static implicit operator IntPtr(Status status)
 
         public void Dispose()
         {
-            c_api.TF_DeleteStatus(_handle);
+            IntPtr h = IntPtr.Zero;
+            lock (this)
+            {
+                h = _handle;
+                _handle = IntPtr.Zero;
+            }
+            if (h != IntPtr.Zero)
+                c_api.TF_DeleteStatus(h);
+            GC.SuppressFinalize(this);
+        }
+
+        ~Status()
+        {
+            Dispose();
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj.DotSettings b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj.DotSettings
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=tensors/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs b/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs
@@ -31,7 +31,21 @@ public partial class Tensor
         /// <summary>
         /// true if unmanaged buffer has been freed.
         /// </summary>
-        private bool deallocator_called => _deallocatorArgs.deallocator_called;
+        private bool _deallocator_called => _deallocatorArgs.deallocator_called;
+
+        /// <summary>
+        /// true if the Tensor was created from a managed array
+        /// </summary>
+        private bool _isPinnedArray => _deallocatorArgs.gc_handle != IntPtr.Zero;
+
+        /// <summary>
+        /// This holds values that are used by the unmanaged deallocator callback
+        /// </summary>
+        private DeallocatorArgs _deallocatorArgs = new DeallocatorArgs() { gc_handle = IntPtr.Zero };
+
+        // note: they must be assigned to a static variable in order to work as unmanaged callbacks
+        static Deallocator _hGlobalDeallocator = FreeHGlobalMemory;
+        static Deallocator _gcHandleDeallocator = FreeGCHandle;
 
         public Tensor(IntPtr handle)
         {
@@ -94,7 +108,7 @@ public unsafe Tensor(sbyte value, TF_DataType? dType = null)
         {
             var v = (sbyte*)Marshal.AllocHGlobal(sizeof(sbyte));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(sbyte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(sbyte), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(sbyte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(sbyte), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -120,7 +134,7 @@ public unsafe Tensor(byte value, TF_DataType? dType = null)
         {
             var v = (byte*)Marshal.AllocHGlobal(sizeof(byte));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(byte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(byte), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(byte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(byte), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -146,7 +160,7 @@ public unsafe Tensor(short value, TF_DataType? dType = null)
         {
             var v = (short*)Marshal.AllocHGlobal(sizeof(short));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(short)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(short), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(short)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(short), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -172,7 +186,7 @@ public unsafe Tensor(ushort value, TF_DataType? dType = null)
         {
             var v = (ushort*)Marshal.AllocHGlobal(sizeof(ushort));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ushort)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ushort), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ushort)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ushort), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -198,7 +212,7 @@ public unsafe Tensor(int value, TF_DataType? dType = null)
         {
             var v = (int*)Marshal.AllocHGlobal(sizeof(int));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(int)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(int), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(int)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(int), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -224,7 +238,7 @@ public unsafe Tensor(uint value, TF_DataType? dType = null)
         {
             var v = (uint*)Marshal.AllocHGlobal(sizeof(uint));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(uint)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(uint), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(uint)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(uint), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -250,7 +264,7 @@ public unsafe Tensor(long value, TF_DataType? dType = null)
         {
             var v = (long*)Marshal.AllocHGlobal(sizeof(long));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(long)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(long), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(long)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(long), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -276,7 +290,7 @@ public unsafe Tensor(ulong value, TF_DataType? dType = null)
         {
             var v = (ulong*)Marshal.AllocHGlobal(sizeof(ulong));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ulong)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ulong), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ulong)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ulong), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -302,7 +316,7 @@ public unsafe Tensor(float value, TF_DataType? dType = null)
         {
             var v = (float*)Marshal.AllocHGlobal(sizeof(float));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(float)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(float), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(float)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(float), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -328,7 +342,7 @@ public unsafe Tensor(double value, TF_DataType? dType = null)
         {
             var v = (double*)Marshal.AllocHGlobal(sizeof(double));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(double)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(double), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(double)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(double), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
         
         /// <summary>
@@ -354,7 +368,7 @@ public unsafe Tensor(Complex value, TF_DataType? dType = null)
         {
             var v = (Complex*)Marshal.AllocHGlobal(sizeof(Complex));
             *v = value;
-            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(Complex)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(Complex), deallocator: hGlobalDeallocator, ref _deallocatorArgs);
+            _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(Complex)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(Complex), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);
         }
 #endif
 
@@ -444,7 +458,7 @@ private unsafe IntPtr Allocate(NDArray nd, TF_DataType? tensorDType = null)
                 dims.Length,
                 dotHandle,
                 (UIntPtr)buffersize,
-                hGlobalDeallocator,
+                _hGlobalDeallocator,
                 ref _deallocatorArgs);
 
             return tfHandle;
@@ -458,8 +472,7 @@ public Tensor(Operation op, int value_index, TF_DataType dtype)
             _id = ops.uid();
         }
 
-        private bool _isPinnedArray => _deallocatorArgs.gc_handle != IntPtr.Zero;
-
+       
         /// <summary>
         /// Creates a new tensor from the given array without copying memory. The array is pinned down and the pointer passed on.
         /// </summary>
@@ -516,17 +529,11 @@ protected unsafe IntPtr CreateTensorWithoutCopying(TF_DataType dt, long[] shape,
             var gcHandle = GCHandle.Alloc(data, GCHandleType.Pinned);
             _deallocatorArgs = new DeallocatorArgs() { gc_handle = GCHandle.ToIntPtr(gcHandle) };
             if (shape == null || shape.Length == 0)
-                return TF_NewTensor(dt, new long[0], 0, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), gcHandleDeallocator, ref _deallocatorArgs);
+                return TF_NewTensor(dt, new long[0], 0, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), _gcHandleDeallocator, ref _deallocatorArgs);
             else
-                return TF_NewTensor(dt, shape, shape.Length, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), gcHandleDeallocator, ref _deallocatorArgs);
+                return TF_NewTensor(dt, shape, shape.Length, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), _gcHandleDeallocator, ref _deallocatorArgs);
         }
 
-        private DeallocatorArgs _deallocatorArgs = new DeallocatorArgs() { gc_handle = IntPtr.Zero };
-
-        // note: they must be assigned to a static variable in order to work as unmanaged callbacks
-        static Deallocator hGlobalDeallocator = FreeHGlobalMemory;
-        static Deallocator gcHandleDeallocator = FreeGCHandle;
-
         [MonoPInvokeCallback(typeof(Deallocator))]
         internal static void FreeHGlobalMemory(IntPtr dataPtr, IntPtr len, ref DeallocatorArgs args)
         {
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -350,12 +350,35 @@ public override string ToString()
 
         public void Dispose()
         {
-            if (_handle != IntPtr.Zero)
+            IntPtr h=IntPtr.Zero;
+            lock (this)
             {
-                c_api.TF_DeleteTensor(_handle);
-                _handle = IntPtr.Zero; 
+                h = _handle;
+                _handle=IntPtr.Zero;
             }
+            if (h != IntPtr.Zero)
+                c_api.TF_DeleteTensor(_handle);
             status.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Dispose the tensor when it gets garbage collected
+        /// </summary>
+        ~Tensor()
+        {
+            Dispose();
+        }
+
+        public bool IsDisposed
+        {
+            get
+            {
+                lock (this)
+                {
+                    return _handle == IntPtr.Zero;
+                }
+            }
         }
 
     }
diff --git a/src/TensorFlowNet.Benchmarks/TensorCreation.cs b/src/TensorFlowNet.Benchmarks/TensorCreation.cs
@@ -7,7 +7,7 @@
 
 namespace TensorFlowNet.Benchmark
 {
-    [SimpleJob(launchCount: 1, warmupCount: 10, targetCount: 30)]
+    [SimpleJob(launchCount: 1, warmupCount: 2, targetCount: 10)]
     [MinColumn, MaxColumn, MeanColumn, MedianColumn]
     public class TensorCreation
     {
@@ -16,16 +16,19 @@ public class TensorCreation
         [GlobalSetup]
         public void Setup()
         {
-            data = new double[1000];
+            data = new double[10];
         }
 
         [Benchmark]
         public void TensorFromArray()
         {
             var g=new Graph();
-            for (int i = 0; i < 100; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 var tensor = new Tensor(data);
+                {
+
+                }
             }
         }
 
@@ -34,9 +37,12 @@ public void TensorFromArray()
         public void TensorFromNDArray()
         {
             var g = new Graph();
-            for (int i = 0; i < 100; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 var tensor = new Tensor(new NDArray(data));
+                {
+
+                }
             }
         }
 
diff --git a/test/TensorFlowNET.UnitTest/TensorTest.cs b/test/TensorFlowNET.UnitTest/TensorTest.cs
@@ -5,17 +5,54 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Tensorflow;
+using static Tensorflow.Python;
 
 namespace TensorFlowNET.UnitTest
 {
     [TestClass]
     public class TensorTest : CApiTest
     {
-        /// <summary>
-        /// Port from c_api_test.cc
-        /// `TEST(CAPI, AllocateTensor)`
-        /// </summary>
+        [TestMethod]
+        public void TensorDeallocationThreadSafety()
+        {
+            var tensors = new Tensor[1000];
+            foreach (var i in range(1000))
+            {
+                tensors[i] = new Tensor(new int[1000]);
+            }
+            SemaphoreSlim s = new SemaphoreSlim(0, 2);
+            SemaphoreSlim s_done = new SemaphoreSlim(0, 2);
+
+            var t1 = new Thread(() =>
+            {
+                s.Wait();
+                foreach (var t in tensors)
+                    t.Dispose();
+                s_done.Release();
+            });
+
+            var t2 = new Thread(() =>
+            {
+                s.Wait();
+                foreach (var t in tensors)
+                    t.Dispose();
+                s_done.Release();
+            });
+
+            t1.Start();
+            t2.Start();
+            s.Release(2);
+            s_done.Wait();
+            s_done.Wait();
+
+            foreach(var t in tensors)
+                Assert.IsTrue(t.IsDisposed);
+        }
+
+
         [TestMethod]
         public void AllocateTensor()
         {
@@ -29,6 +66,7 @@ public void AllocateTensor()
             t.Dispose();*/
         }
 
+
         /// <summary>
         /// Port from c_api_test.cc
         /// `TEST(CAPI, MaybeMove)`

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace Tensorflow`
`26`	`26`	`/// </summary>`
`27`	`27`	`public class Status : IDisposable`
`28`	`28`	`{`
`29`		`- protected readonly IntPtr _handle;`
	`29`	`+ protected IntPtr _handle;`
`30`	`30`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// Error message`
`@@ -71,7 +71,20 @@ public static implicit operator IntPtr(Status status)`
`71`	`71`
`72`	`72`	`public void Dispose()`
`73`	`73`	`{`
`74`		`- c_api.TF_DeleteStatus(_handle);`
	`74`	`+ IntPtr h = IntPtr.Zero;`
	`75`	`+ lock (this)`
	`76`	`+ {`
	`77`	`+ h = _handle;`
	`78`	`+ _handle = IntPtr.Zero;`
	`79`	`+ }`
	`80`	`+ if (h != IntPtr.Zero)`
	`81`	`+ c_api.TF_DeleteStatus(h);`
	`82`	`+ GC.SuppressFinalize(this);`
	`83`	`+ }`
	`84`	`+`
	`85`	`+ ~Status()`
	`86`	`+ {`
	`87`	`+ Dispose();`
`75`	`88`	`}`
`76`	`89`	`}`
`77`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">`
	`2`	`+ <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=tensors/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,21 @@ public partial class Tensor`
`31`	`31`	`/// <summary>`
`32`	`32`	`/// true if unmanaged buffer has been freed.`
`33`	`33`	`/// </summary>`
`34`		`- private bool deallocator_called => _deallocatorArgs.deallocator_called;`
	`34`	`+ private bool _deallocator_called => _deallocatorArgs.deallocator_called;`
	`35`	`+`
	`36`	`+ /// <summary>`
	`37`	`+ /// true if the Tensor was created from a managed array`
	`38`	`+ /// </summary>`
	`39`	`+ private bool _isPinnedArray => _deallocatorArgs.gc_handle != IntPtr.Zero;`
	`40`	`+`
	`41`	`+ /// <summary>`
	`42`	`+ /// This holds values that are used by the unmanaged deallocator callback`
	`43`	`+ /// </summary>`
	`44`	`+ private DeallocatorArgs _deallocatorArgs = new DeallocatorArgs() { gc_handle = IntPtr.Zero };`
	`45`	`+`
	`46`	`+ // note: they must be assigned to a static variable in order to work as unmanaged callbacks`
	`47`	`+ static Deallocator _hGlobalDeallocator = FreeHGlobalMemory;`
	`48`	`+ static Deallocator _gcHandleDeallocator = FreeGCHandle;`
`35`	`49`
`36`	`50`	`public Tensor(IntPtr handle)`
`37`	`51`	`{`
`@@ -94,7 +108,7 @@ public unsafe Tensor(sbyte value, TF_DataType? dType = null)`
`94`	`108`	`{`
`95`	`109`	`var v = (sbyte*)Marshal.AllocHGlobal(sizeof(sbyte));`
`96`	`110`	`*v = value;`
`97`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(sbyte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(sbyte), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`111`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(sbyte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(sbyte), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`98`	`112`	`}`
`99`	`113`
`100`	`114`	`/// <summary>`
`@@ -120,7 +134,7 @@ public unsafe Tensor(byte value, TF_DataType? dType = null)`
`120`	`134`	`{`
`121`	`135`	`var v = (byte*)Marshal.AllocHGlobal(sizeof(byte));`
`122`	`136`	`*v = value;`
`123`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(byte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(byte), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`137`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(byte)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(byte), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`124`	`138`	`}`
`125`	`139`
`126`	`140`	`/// <summary>`
`@@ -146,7 +160,7 @@ public unsafe Tensor(short value, TF_DataType? dType = null)`
`146`	`160`	`{`
`147`	`161`	`var v = (short*)Marshal.AllocHGlobal(sizeof(short));`
`148`	`162`	`*v = value;`
`149`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(short)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(short), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`163`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(short)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(short), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`150`	`164`	`}`
`151`	`165`
`152`	`166`	`/// <summary>`
`@@ -172,7 +186,7 @@ public unsafe Tensor(ushort value, TF_DataType? dType = null)`
`172`	`186`	`{`
`173`	`187`	`var v = (ushort*)Marshal.AllocHGlobal(sizeof(ushort));`
`174`	`188`	`*v = value;`
`175`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ushort)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ushort), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`189`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ushort)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ushort), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`176`	`190`	`}`
`177`	`191`
`178`	`192`	`/// <summary>`
`@@ -198,7 +212,7 @@ public unsafe Tensor(int value, TF_DataType? dType = null)`
`198`	`212`	`{`
`199`	`213`	`var v = (int*)Marshal.AllocHGlobal(sizeof(int));`
`200`	`214`	`*v = value;`
`201`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(int)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(int), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`215`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(int)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(int), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`202`	`216`	`}`
`203`	`217`
`204`	`218`	`/// <summary>`
`@@ -224,7 +238,7 @@ public unsafe Tensor(uint value, TF_DataType? dType = null)`
`224`	`238`	`{`
`225`	`239`	`var v = (uint*)Marshal.AllocHGlobal(sizeof(uint));`
`226`	`240`	`*v = value;`
`227`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(uint)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(uint), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`241`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(uint)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(uint), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`228`	`242`	`}`
`229`	`243`
`230`	`244`	`/// <summary>`
`@@ -250,7 +264,7 @@ public unsafe Tensor(long value, TF_DataType? dType = null)`
`250`	`264`	`{`
`251`	`265`	`var v = (long*)Marshal.AllocHGlobal(sizeof(long));`
`252`	`266`	`*v = value;`
`253`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(long)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(long), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`267`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(long)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(long), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`254`	`268`	`}`
`255`	`269`
`256`	`270`	`/// <summary>`
`@@ -276,7 +290,7 @@ public unsafe Tensor(ulong value, TF_DataType? dType = null)`
`276`	`290`	`{`
`277`	`291`	`var v = (ulong*)Marshal.AllocHGlobal(sizeof(ulong));`
`278`	`292`	`*v = value;`
`279`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ulong)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ulong), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`293`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(ulong)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(ulong), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`280`	`294`	`}`
`281`	`295`
`282`	`296`	`/// <summary>`
`@@ -302,7 +316,7 @@ public unsafe Tensor(float value, TF_DataType? dType = null)`
`302`	`316`	`{`
`303`	`317`	`var v = (float*)Marshal.AllocHGlobal(sizeof(float));`
`304`	`318`	`*v = value;`
`305`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(float)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(float), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`319`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(float)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(float), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`306`	`320`	`}`
`307`	`321`
`308`	`322`	`/// <summary>`
`@@ -328,7 +342,7 @@ public unsafe Tensor(double value, TF_DataType? dType = null)`
`328`	`342`	`{`
`329`	`343`	`var v = (double*)Marshal.AllocHGlobal(sizeof(double));`
`330`	`344`	`*v = value;`
`331`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(double)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(double), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`345`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(double)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(double), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`332`	`346`	`}`
`333`	`347`
`334`	`348`	`/// <summary>`
`@@ -354,7 +368,7 @@ public unsafe Tensor(Complex value, TF_DataType? dType = null)`
`354`	`368`	`{`
`355`	`369`	`var v = (Complex*)Marshal.AllocHGlobal(sizeof(Complex));`
`356`	`370`	`*v = value;`
`357`		`- _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(Complex)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(Complex), deallocator: hGlobalDeallocator, ref _deallocatorArgs);`
	`371`	`+ _handle = TF_NewTensor(dType ?? dtypes.as_dtype(typeof(Complex)), dims:new long[0], num_dims: 0, data: (IntPtr)v, len: (UIntPtr)sizeof(Complex), deallocator: _hGlobalDeallocator, ref _deallocatorArgs);`
`358`	`372`	`}`
`359`	`373`	`#endif`
`360`	`374`
`@@ -444,7 +458,7 @@ private unsafe IntPtr Allocate(NDArray nd, TF_DataType? tensorDType = null)`
`444`	`458`	`dims.Length,`
`445`	`459`	`dotHandle,`
`446`	`460`	`(UIntPtr)buffersize,`
`447`		`- hGlobalDeallocator,`
	`461`	`+ _hGlobalDeallocator,`
`448`	`462`	`ref _deallocatorArgs);`
`449`	`463`
`450`	`464`	`return tfHandle;`
`@@ -458,8 +472,7 @@ public Tensor(Operation op, int value_index, TF_DataType dtype)`
`458`	`472`	`_id = ops.uid();`
`459`	`473`	`}`
`460`	`474`
`461`		`- private bool _isPinnedArray => _deallocatorArgs.gc_handle != IntPtr.Zero;`
`462`		`-`
	`475`	`+`
`463`	`476`	`/// <summary>`
`464`	`477`	`/// Creates a new tensor from the given array without copying memory. The array is pinned down and the pointer passed on.`
`465`	`478`	`/// </summary>`
`@@ -516,17 +529,11 @@ protected unsafe IntPtr CreateTensorWithoutCopying(TF_DataType dt, long[] shape,`
`516`	`529`	`var gcHandle = GCHandle.Alloc(data, GCHandleType.Pinned);`
`517`	`530`	`_deallocatorArgs = new DeallocatorArgs() { gc_handle = GCHandle.ToIntPtr(gcHandle) };`
`518`	`531`	`if (shape == null \|\| shape.Length == 0)`
`519`		`- return TF_NewTensor(dt, new long[0], 0, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), gcHandleDeallocator, ref _deallocatorArgs);`
	`532`	`+ return TF_NewTensor(dt, new long[0], 0, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), _gcHandleDeallocator, ref _deallocatorArgs);`
`520`	`533`	`else`
`521`		`- return TF_NewTensor(dt, shape, shape.Length, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), gcHandleDeallocator, ref _deallocatorArgs);`
	`534`	`+ return TF_NewTensor(dt, shape, shape.Length, gcHandle.AddrOfPinnedObject() + start * element_size, (UIntPtr)(count * element_size), _gcHandleDeallocator, ref _deallocatorArgs);`
`522`	`535`	`}`
`523`	`536`
`524`		`- private DeallocatorArgs _deallocatorArgs = new DeallocatorArgs() { gc_handle = IntPtr.Zero };`
`525`		`-`
`526`		`- // note: they must be assigned to a static variable in order to work as unmanaged callbacks`
`527`		`- static Deallocator hGlobalDeallocator = FreeHGlobalMemory;`
`528`		`- static Deallocator gcHandleDeallocator = FreeGCHandle;`
`529`		`-`
`530`	`537`	`[MonoPInvokeCallback(typeof(Deallocator))]`
`531`	`538`	`internal static void FreeHGlobalMemory(IntPtr dataPtr, IntPtr len, ref DeallocatorArgs args)`
`532`	`539`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace TensorFlowNet.Benchmark`
`9`	`9`	`{`
`10`		`- [SimpleJob(launchCount: 1, warmupCount: 10, targetCount: 30)]`
	`10`	`+ [SimpleJob(launchCount: 1, warmupCount: 2, targetCount: 10)]`
`11`	`11`	`[MinColumn, MaxColumn, MeanColumn, MedianColumn]`
`12`	`12`	`public class TensorCreation`
`13`	`13`	`{`
`@@ -16,16 +16,19 @@ public class TensorCreation`
`16`	`16`	`[GlobalSetup]`
`17`	`17`	`public void Setup()`
`18`	`18`	`{`
`19`		`- data = new double[1000];`
	`19`	`+ data = new double[10];`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[Benchmark]`
`23`	`23`	`public void TensorFromArray()`
`24`	`24`	`{`
`25`	`25`	`var g=new Graph();`
`26`		`- for (int i = 0; i < 100; i++)`
	`26`	`+ for (int i = 0; i < 1000; i++)`
`27`	`27`	`{`
`28`	`28`	`var tensor = new Tensor(data);`
	`29`	`+ {`
	`30`	`+`
	`31`	`+ }`
`29`	`32`	`}`
`30`	`33`	`}`
`31`	`34`
`@@ -34,9 +37,12 @@ public void TensorFromArray()`
`34`	`37`	`public void TensorFromNDArray()`
`35`	`38`	`{`
`36`	`39`	`var g = new Graph();`
`37`		`- for (int i = 0; i < 100; i++)`
	`40`	`+ for (int i = 0; i < 1000; i++)`
`38`	`41`	`{`
`39`	`42`	`var tensor = new Tensor(new NDArray(data));`
	`43`	`+ {`
	`44`	`+`
	`45`	`+ }`
`40`	`46`	`}`
`41`	`47`	`}`
`42`	`48`