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); + } } /// 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(); - } } } 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 diff --git a/test/TensorFlowNET.UnitTest/NameScopeTest.cs b/test/TensorFlowNET.UnitTest/NameScopeTest.cs index 5c307b9f..7a9ae062 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();