- Redesigned disposing code for objects which interact with inference sessions

Author: KQTENQK

src/MOT.CORE/Matchers/Abstract/Matcher.cs

@@ -1,13 +1,14 @@
 using MOT.CORE.Utils.Pool;
 using MOT.CORE.YOLO;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace MOT.CORE.Matchers.Abstract
 {
-    public abstract class Matcher
+    public abstract class Matcher : IDisposable
     {
         private int _startTrackerIndex = 1;
 
@@ -66,5 +67,7 @@ protected virtual void InitNewTrack<TTracker, TTrack>(TTracker tracker, TTrack t
             if (_startTrackerIndex == int.MaxValue)
                 _startTrackerIndex = 1;
         }
+
+        public abstract void Dispose();
     }
 }

src/MOT.CORE/Matchers/Deep/DeepMatcher.cs

@@ -57,6 +57,12 @@ public override IReadOnlyList<ITrack> Run(Bitmap frame, float targetConfidence,
             return tracks;
         }
 
+        public override void Dispose()
+        {
+            _predictor.Dispose();
+            _appearanceExtractor.Dispose();
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private List<DeepTrack> Init(IReadOnlyList<IPrediction> detectedObjects, IReadOnlyList<Vector> appearances)
         {

src/MOT.CORE/Matchers/Deep/DeepSortMatcher.cs

@@ -22,9 +22,9 @@ public class DeepSortMatcher : Matcher
         private List<PoolObject<KalmanTracker<DeepSortTrack>>> _trackers = new List<PoolObject<KalmanTracker<DeepSortTrack>>>();
 
         public DeepSortMatcher(IPredictor predictor, IAppearanceExtractor appearanceExtractor,
-            float appearanceWeight = 0.775f, float threshold = 0.765f, int maxMisses = 50,
-            int framesToAppearanceSmooth = 70, float smoothAppearanceWeight = 0.875f,
-            int minStreak = 5, int poolCapacity = 50)
+            float appearanceWeight = 0.775f, float threshold = 0.5f, int maxMisses = 50,
+            int framesToAppearanceSmooth = 40, float smoothAppearanceWeight = 0.875f,
+            int minStreak = 8, int poolCapacity = 50)
             : base(maxMisses, minStreak)
         {
             _predictor = predictor;
@@ -68,6 +68,12 @@ public override IReadOnlyList<ITrack> Run(Bitmap frame, float targetConfidence,
             return tracks;
         }
 
+        public override void Dispose()
+        {
+            _predictor.Dispose();
+            _appearanceExtractor.Dispose();
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private List<DeepSortTrack> Init(IReadOnlyList<IPrediction> detectedObjects, IReadOnlyList<Vector> appearances)
         {

src/MOT.CORE/Matchers/SORT/SortMatcher.cs

@@ -52,6 +52,11 @@ public override IReadOnlyList<ITrack> Run(Bitmap frame, float targetConfidence,
             return tracks;
         }
 
+        public override void Dispose()
+        {
+            _predictor.Dispose();
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private List<SortTrack> Init(IReadOnlyList<IPrediction> detectedObjects)
         {

src/MOT.CORE/ReID/IAppearanceExtractor.cs

@@ -1,11 +1,12 @@
 using MOT.CORE.Utils.DataStructs;
 using MOT.CORE.YOLO;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 
 namespace MOT.CORE.ReID
 {
-    public interface IAppearanceExtractor
+    public interface IAppearanceExtractor : IDisposable
     {
         public abstract IReadOnlyList<Vector> Predict(Bitmap image, IPrediction[] detectedBounds);
     }

src/MOT.CORE/ReID/ReidScorer.cs

@@ -12,7 +12,7 @@
 
 namespace MOT.CORE.ReID
 {
-    public class ReidScorer<TReidModel> : IDisposable, IAppearanceExtractor where TReidModel : IReidModel
+    public class ReidScorer<TReidModel> : IAppearanceExtractor where TReidModel : IReidModel
     {
         private readonly IReidModel _reidModel;
         private readonly List<InferenceSession> _inferenceSessions;

src/MOT.CORE/YOLO/IPredictor.cs

@@ -1,9 +1,10 @@
 using System.Drawing;
 using System.Collections.Generic;
+using System;
 
 namespace MOT.CORE.YOLO
 {
-    public interface IPredictor
+    public interface IPredictor : IDisposable
     {
         public abstract IReadOnlyList<IPrediction> Predict(Bitmap image, float targetConfidence, params DetectionObjectType[] targetDetectionTypes);
     }

src/MOT.CORE/YOLO/YoloScorer.cs

@@ -15,7 +15,7 @@
 
 namespace MOT.CORE.YOLO
 {
-    public class YoloScorer<TYoloModel> : IDisposable, IPredictor where TYoloModel : IYoloModel
+    public class YoloScorer<TYoloModel> : IPredictor where TYoloModel : IYoloModel
     {
         private readonly InferenceSession _inferenceSession;
         private readonly TYoloModel _yoloModel;