RemoveDisposeScope

Author: yueyinqiu

RELEASENOTES.md

@@ -10,6 +10,7 @@ __API Changes__:
 
 __Bug Fixes__:
 
+- Now `DisposeScopes` could be correctly disposed in a wrong order.
 
 # NuGet Version 0.102.4
 

src/TorchSharp/DisposeScope.cs

@@ -20,7 +20,8 @@ public DisposeScope(DisposeScopeManager disposeScopeManager)
         {
             _disposeScopeManager = disposeScopeManager ?? throw new ArgumentNullException(nameof(disposeScopeManager));
             if (disposeScopeManager.DisposeScopeStack.Count > 0) {
-                OuterScope = disposeScopeManager.DisposeScopeStack.Peek();
+                OuterScope = disposeScopeManager.DisposeScopeStack[
+                    disposeScopeManager.DisposeScopeStack.Count - 1];
             }
         }
 

src/TorchSharp/DisposeScopeManager.cs

@@ -18,7 +18,7 @@ public class DisposeScopeManager
         internal ThreadDisposeScopeStatistics StatisticsInstance { get; } = new ThreadDisposeScopeStatistics();
 
         internal static DisposeScopeManager ThreadSingleton => (_threadSingleton ??= new DisposeScopeManager());
-        internal Stack<DisposeScope> DisposeScopeStack { get; } = new();
+        internal List<DisposeScope> DisposeScopeStack { get; } = new();
 
         public static ThreadDisposeScopeStatistics Statistics => ThreadSingleton.StatisticsInstance;
 
@@ -30,7 +30,7 @@ public class DisposeScopeManager
             }
 
             StatisticsInstance.CreatedInScopeCount++;
-            var current = DisposeScopeStack.Peek();
+            var current = DisposeScopeStack[DisposeScopeStack.Count - 1];
             current.Include(disposable);
             return current;
         }
@@ -42,15 +42,15 @@ internal static DisposeScope NewDisposeScope()
 
         internal void RemoveDisposeScope(DisposeScope disposeScope)
         {
-            Debug.Assert(DisposeScopeStack.Count > 0);
-            Debug.Assert(DisposeScopeStack.Peek() == disposeScope);
-            DisposeScopeStack.Pop();
+            var index = DisposeScopeStack.LastIndexOf(disposeScope);
+            if (index is not -1)
+                DisposeScopeStack.RemoveAt(index);
         }
 
         private DisposeScope InnerNewDisposeScope()
         {
             var disposeScope = new DisposeScope(this);
-            DisposeScopeStack.Push(disposeScope);
+            DisposeScopeStack.Add(disposeScope);
             return disposeScope;
         }
     }