release v0.10.7.2.

Oceania2018 · Oceania2018 · commit 34ed75132fe1 · 2019-08-01T16:15:58.000-05:00
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.cs b/src/TensorFlowNET.Core/Graphs/Graph.cs
@@ -445,12 +445,12 @@ public void prevent_fetching(Operation op)
 
         public void Dispose()
         {
-            if (_handle != IntPtr.Zero)
+            /*if (_handle != IntPtr.Zero)
                 c_api.TF_DeleteGraph(_handle);
 
             _handle = IntPtr.Zero;
 
-            GC.SuppressFinalize(this);
+            GC.SuppressFinalize(this);*/
         }
 
         /// <summary>
diff --git a/src/TensorFlowNET.Core/Sessions/Session.cs b/src/TensorFlowNET.Core/Sessions/Session.cs
@@ -83,13 +83,19 @@ public void close()
 
         public void Dispose()
         {
-            if (_session != IntPtr.Zero)
+            IntPtr h = IntPtr.Zero;
+            lock (this)
+            {
+                h = _session;
+                _session = IntPtr.Zero;
+            }
+            if (h != IntPtr.Zero)
             {
                 var status = new Status();
-                c_api.TF_DeleteSession(_session, status);
+                c_api.TF_DeleteSession(h, status);
+                status.Check(true);
             }
-
-            _session = IntPtr.Zero;
+            
             GC.SuppressFinalize(this);
         }
 
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>TensorFlow.NET</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>1.14.0</TargetTensorFlow>
-    <Version>0.10.7</Version>
+    <Version>0.10.7.2</Version>
     <Authors>Haiping Chen, Meinrad Recheis</Authors>
     <Company>SciSharp STACK</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -17,7 +17,7 @@
     <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.10.7.0</AssemblyVersion>
+    <AssemblyVersion>0.10.7.2</AssemblyVersion>
     <PackageReleaseNotes>Changes since v0.9.0:
 
 1. Added full connected Convolution Neural Network example.
@@ -36,7 +36,7 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 14. Fix TF_String endcode and decode.
 15. Fix Tensor memory leak.</PackageReleaseNotes>
     <LangVersion>7.2</LangVersion>
-    <FileVersion>0.10.7.0</FileVersion>
+    <FileVersion>0.10.7.2</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -135,7 +135,9 @@ public int rank
                 {
                     var status = new Status();
                     var output = _as_tf_output();
-                    return c_api.TF_GraphGetTensorNumDims(op.graph, output, status);
+                    int ndim = c_api.TF_GraphGetTensorNumDims(op.graph, output, status);
+                    status.Check();
+                    return ndim;
                 }
                 else
                 {
@@ -394,15 +396,14 @@ public override string ToString()
 
         public void Dispose()
         {
-            IntPtr h=IntPtr.Zero;
+            IntPtr h = IntPtr.Zero;
             lock (this)
             {
                 h = _handle;
-                _handle=IntPtr.Zero;
+                _handle = IntPtr.Zero;
             }
             if (h != IntPtr.Zero)
                 c_api.TF_DeleteTensor(h);
-            
             GC.SuppressFinalize(this);
         }
 
diff --git a/test/TensorFlowNET.Examples/ImageProcessing/RetrainImageClassifier.cs b/test/TensorFlowNET.Examples/ImageProcessing/RetrainImageClassifier.cs
@@ -83,10 +83,10 @@ public bool Run()
             #region For debug purpose
             
             // predict images
-            Predict(null);
+            // Predict(null);
 
             // load saved pb and test new images.
-            Test(null); 
+            // Test(null); 
             
             #endregion
 

Original file line number	Diff line number	Diff line change
`@@ -445,12 +445,12 @@ public void prevent_fetching(Operation op)`
`445`	`445`
`446`	`446`	`public void Dispose()`
`447`	`447`	`{`
`448`		`- if (_handle != IntPtr.Zero)`
	`448`	`+ /*if (_handle != IntPtr.Zero)`
`449`	`449`	`c_api.TF_DeleteGraph(_handle);`
`450`	`450`
`451`	`451`	`_handle = IntPtr.Zero;`
`452`	`452`
`453`		`- GC.SuppressFinalize(this);`
	`453`	`+ GC.SuppressFinalize(this);*/`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,19 @@ public void close()`
`83`	`83`
`84`	`84`	`public void Dispose()`
`85`	`85`	`{`
`86`		`- if (_session != IntPtr.Zero)`
	`86`	`+ IntPtr h = IntPtr.Zero;`
	`87`	`+ lock (this)`
	`88`	`+ {`
	`89`	`+ h = _session;`
	`90`	`+ _session = IntPtr.Zero;`
	`91`	`+ }`
	`92`	`+ if (h != IntPtr.Zero)`
`87`	`93`	`{`
`88`	`94`	`var status = new Status();`
`89`		`- c_api.TF_DeleteSession(_session, status);`
	`95`	`+ c_api.TF_DeleteSession(h, status);`
	`96`	`+ status.Check(true);`
`90`	`97`	`}`
`91`		`-`
`92`		`- _session = IntPtr.Zero;`
	`98`	`+`
`93`	`99`	`GC.SuppressFinalize(this);`
`94`	`100`	`}`
`95`	`101`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,9 @@ public int rank`
`135`	`135`	`{`
`136`	`136`	`var status = new Status();`
`137`	`137`	`var output = _as_tf_output();`
`138`		`- return c_api.TF_GraphGetTensorNumDims(op.graph, output, status);`
	`138`	`+ int ndim = c_api.TF_GraphGetTensorNumDims(op.graph, output, status);`
	`139`	`+ status.Check();`
	`140`	`+ return ndim;`
`139`	`141`	`}`
`140`	`142`	`else`
`141`	`143`	`{`
`@@ -394,15 +396,14 @@ public override string ToString()`
`394`	`396`
`395`	`397`	`public void Dispose()`
`396`	`398`	`{`
`397`		`- IntPtr h=IntPtr.Zero;`
	`399`	`+ IntPtr h = IntPtr.Zero;`
`398`	`400`	`lock (this)`
`399`	`401`	`{`
`400`	`402`	`h = _handle;`
`401`		`- _handle=IntPtr.Zero;`
	`403`	`+ _handle = IntPtr.Zero;`
`402`	`404`	`}`
`403`	`405`	`if (h != IntPtr.Zero)`
`404`	`406`	`c_api.TF_DeleteTensor(h);`
`405`		`-`
`406`	`407`	`GC.SuppressFinalize(this);`
`407`	`408`	`}`
`408`	`409`