reqs checker refactor

mikel-brostrom · Jul 12, 2024 · 648b05b · 648b05b
1 parent 5437b36
commit 648b05b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/boxmot/appearance/backends/onnx_backend.py b/boxmot/appearance/backends/onnx_backend.py
@@ -4,7 +4,7 @@
 from boxmot.appearance.backends.base_backend import BaseModelBackend
 from boxmot.utils.checks import RequirementsChecker
 
-tr = RequirementsChecker()
+checker = RequirementsChecker()
 
 
 class ONNXBackend(BaseModelBackend):
@@ -16,7 +16,7 @@ def __init__(self, weights, device, half):
 
     def load_model(self, w):
 
-        tr.check_packages(("onnxruntime-gpu==1.16.3" if self.cuda else "onnxruntime==1.16.3", ))
+        checker.check_packages(("onnxruntime-gpu==1.16.3" if self.cuda else "onnxruntime==1.16.3", ))
         import onnxruntime
 
         providers = (["CUDAExecutionProvider", "CPUExecutionProvider"] if self.cuda else ["CPUExecutionProvider"])

diff --git a/boxmot/appearance/backends/openvino_backend.py b/boxmot/appearance/backends/openvino_backend.py
@@ -5,7 +5,7 @@
 from boxmot.appearance.backends.base_backend import BaseModelBackend
 from boxmot.utils.checks import RequirementsChecker
 
-tr = RequirementsChecker()
+checker = RequirementsChecker()
 
 
 class OpenVinoBackend(BaseModelBackend):
@@ -16,6 +16,7 @@ def __init__(self, weights, device, half):
         self.half = half
 
     def load_model(self, w):
+        checker.check_packages(("openvino-dev>=2022.3",))
 
         LOGGER.info(f"Loading {w} for OpenVINO inference...")
         try:

diff --git a/boxmot/appearance/backends/tensorrt_backend.py b/boxmot/appearance/backends/tensorrt_backend.py
@@ -6,7 +6,7 @@
 from boxmot.appearance.backends.base_backend import BaseModelBackend
 from boxmot.utils.checks import RequirementsChecker
 
-tr = RequirementsChecker()
+checker = RequirementsChecker()
 
 
 class TensorRTBackend(BaseModelBackend):
@@ -19,7 +19,7 @@ def __init__(self, weights, device, half):
     def load_model(self, w):
 
         LOGGER.info(f"Loading {w} for TensorRT inference...")
-        tr.check_packages(("nvidia-tensorrt",))
+        checker.check_packages(("nvidia-tensorrt",))
         import tensorrt as trt  # https://developer.nvidia.com/nvidia-tensorrt-download
 
         if device.type == "cpu":

diff --git a/boxmot/appearance/backends/tflite_backend.py b/boxmot/appearance/backends/tflite_backend.py
@@ -6,7 +6,7 @@
 from boxmot.appearance.backends.base_backend import BaseModelBackend
 from boxmot.utils.checks import RequirementsChecker
 
-tr = RequirementsChecker()
+checker = RequirementsChecker()
 
 
 class TFLiteBackend(BaseModelBackend):
@@ -17,11 +17,13 @@ def __init__(self, weights, device, half):
         self.half = half
 
     def load_model(self, w):
+        checker.check_packages(("tensorflow",))
 
         LOGGER.info(f"Loading {w} for TensorFlow Lite inference...")
-        import tensorflow as tf
-        interpreter = tf.lite.Interpreter(model_path=str(w))
+
         try:
+            import tensorflow as tf
+            interpreter = tf.lite.Interpreter(model_path=str(w))
             self.tf_lite_model = interpreter.get_signature_runner()
         except Exception as e:
             LOGGER.error(f'{e}. If SignatureDef error. Export you model with the official onn2tf docker')

diff --git a/boxmot/appearance/backends/torchscript_backend.py b/boxmot/appearance/backends/torchscript_backend.py
@@ -4,9 +4,6 @@
 from boxmot.utils import logger as LOGGER
 
 from boxmot.appearance.backends.base_backend import BaseModelBackend
-from boxmot.utils.checks import RequirementsChecker
-
-tr = RequirementsChecker()
 
 
 class TorchscriptBackend(BaseModelBackend):

diff --git a/tracking/detectors/__init__.py b/tracking/detectors/__init__.py
@@ -3,7 +3,7 @@
 from boxmot.utils import logger as LOGGER
 from boxmot.utils.checks import RequirementsChecker
 
-tr = RequirementsChecker()
+checker = RequirementsChecker()
 
 
 def get_yolo_inferer(yolo_model):
@@ -13,9 +13,9 @@ def get_yolo_inferer(yolo_model):
             import yolox  # for linear_assignment
             assert yolox.__version__
         except (ImportError, AssertionError, AttributeError):
-            tr.check_packages(('yolox==0.3.0',), cmds='--no-dependencies')
-            tr.check_packages(('tabulate',))  # needed dependency
-            tr.check_packages(('thop',))  # needed dependency
+            checker.check_packages(('yolox==0.3.0',), cmds='--no-dependencies')
+            checker.check_packages(('tabulate',))  # needed dependency
+            checker.check_packages(('thop',))  # needed dependency
         from .yolox import YoloXStrategy
         return YoloXStrategy
     elif 'yolov8' in str(yolo_model):
@@ -27,7 +27,7 @@ def get_yolo_inferer(yolo_model):
             import super_gradients  # for linear_assignment
             assert super_gradients.__version__
         except (ImportError, AssertionError, AttributeError):
-            tr.check_packages(('super-gradients==3.1.3',))  # install
+            checker.check_packages(('super-gradients==3.1.3',))  # install
         from .yolonas import YoloNASStrategy
         return YoloNASStrategy
     else:

diff --git a/tracking/generate_dets_n_embs.py b/tracking/generate_dets_n_embs.py
@@ -12,8 +12,8 @@
 from tracking.detectors import get_yolo_inferer
 from boxmot.appearance.reid_auto_backend import ReidAutoBackend
 
-__tr = RequirementsChecker()
-__tr.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
+checker = RequirementsChecker()
+checker.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
 
 from ultralytics import YOLO
 from ultralytics.data.utils import VID_FORMATS

diff --git a/tracking/generate_mot_results.py b/tracking/generate_mot_results.py
@@ -24,8 +24,8 @@
 from tracking.utils import convert_to_mot_format, write_mot_results
 from boxmot.utils.torch_utils import select_device
 
-__tr = RequirementsChecker()
-__tr.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
+checker = RequirementsChecker()
+checker.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
 
 
 def generate_mot_results(args):

diff --git a/tracking/track.py b/tracking/track.py
@@ -14,8 +14,8 @@
 from boxmot.utils.checks import RequirementsChecker
 from tracking.detectors import get_yolo_inferer
 
-__tr = RequirementsChecker()
-__tr.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
+checker = RequirementsChecker()
+checker.check_packages(('ultralytics @ git+https://github.com/mikel-brostrom/ultralytics.git', ))  # install
 
 from ultralytics import YOLO
 from ultralytics.utils.plotting import Annotator, colors