From 463c62e412fdfd56ff6aedca1d74ee36a37668f3 Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Thu, 29 Aug 2019 00:19:07 +0300 Subject: [PATCH 1/4] DisposableObject.Dispose(): Added lock to prevent concurrent disposal --- src/TensorFlowNET.Core/DisposableObject.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TensorFlowNET.Core/DisposableObject.cs b/src/TensorFlowNET.Core/DisposableObject.cs index 53a15abc..a7fc5a2c 100644 --- a/src/TensorFlowNET.Core/DisposableObject.cs +++ b/src/TensorFlowNET.Core/DisposableObject.cs @@ -77,8 +77,11 @@ namespace Tensorflow public void Dispose() { - internal_dispose(true); - GC.SuppressFinalize(this); + lock(this) + { + internal_dispose(true); + GC.SuppressFinalize(this); + } } /// From 4e2e71d888b6da2f87d0af15a46c4aad3624dcf0 Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Thu, 29 Aug 2019 00:25:00 +0300 Subject: [PATCH 2/4] Added Eli Belash to Authors --- src/TensorFlowNET.Core/TensorFlowNET.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj index aba22c21..bd8c0a29 100644 --- a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj +++ b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj @@ -6,7 +6,7 @@ Tensorflow 1.14.0 0.11.1 - Haiping Chen, Meinrad Recheis + Haiping Chen, Meinrad Recheis, Eli Belash SciSharp STACK true Apache 2.0 From ae72160d33555e97dfe4affda5d9abeca6d988aa Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Thu, 29 Aug 2019 00:25:17 +0300 Subject: [PATCH 3/4] Removed redundant deconstructors --- .../Framework/Models/ScopedTFImportGraphDefResults.cs | 5 ----- src/TensorFlowNET.Core/Framework/Models/ScopedTFStatus.cs | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/TensorFlowNET.Core/Framework/Models/ScopedTFImportGraphDefResults.cs b/src/TensorFlowNET.Core/Framework/Models/ScopedTFImportGraphDefResults.cs index fde7d2bb..dc1236e3 100644 --- a/src/TensorFlowNET.Core/Framework/Models/ScopedTFImportGraphDefResults.cs +++ b/src/TensorFlowNET.Core/Framework/Models/ScopedTFImportGraphDefResults.cs @@ -13,10 +13,5 @@ namespace Tensorflow.Framework.Models { } - - ~ScopedTFImportGraphDefResults() - { - base.Dispose(); - } } } diff --git a/src/TensorFlowNET.Core/Framework/Models/ScopedTFStatus.cs b/src/TensorFlowNET.Core/Framework/Models/ScopedTFStatus.cs index 068cfbee..a427c994 100644 --- a/src/TensorFlowNET.Core/Framework/Models/ScopedTFStatus.cs +++ b/src/TensorFlowNET.Core/Framework/Models/ScopedTFStatus.cs @@ -5,10 +5,5 @@ public ScopedTFStatus() : base() { } - - ~ScopedTFStatus() - { - base.Dispose(); - } } } From cb68cd3500de4d22b18057ae0988bb4b40a2f611 Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Thu, 29 Aug 2019 00:47:01 +0300 Subject: [PATCH 4/4] Ignored unimplemented unit-test --- test/TensorFlowNET.UnitTest/NameScopeTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TensorFlowNET.UnitTest/NameScopeTest.cs b/test/TensorFlowNET.UnitTest/NameScopeTest.cs index 3d763b38..20524123 100644 --- a/test/TensorFlowNET.UnitTest/NameScopeTest.cs +++ b/test/TensorFlowNET.UnitTest/NameScopeTest.cs @@ -44,7 +44,7 @@ namespace TensorFlowNET.UnitTest Assert.AreEqual("", g._name_stack); } - [TestMethod] + [TestMethod, Ignore("Unimplemented Usage")] public void NestedNameScope_Using() { Graph g = tf.Graph().as_default();