Merge pull request #65 from BirenMer/import-correction

updating imports for torchreid

Author: mikel-brostrom

reid_export.py

@@ -19,8 +19,8 @@
 
 from yolov7.utils.general import colorstr
 from yolov7.utils.add_nms import LOGGER
-from strong_sort.deep.reid.torchreid.utils.feature_extractor import FeatureExtractor
-from strong_sort.deep.reid.torchreid.models import build_model
+from strong_sort.deep.reid.torchreid.utils.reid.feature_extractor import FeatureExtractor
+from strong_sort.deep.reid.torchreid.reid.models import build_model
 from strong_sort.deep.reid_model_factory import get_model_name
 
 

requirements.txt

@@ -35,10 +35,11 @@ flake8
 yapf
 isort==4.3.21
 imageio
+torchreid
 
 # Export --------------------------------------
 #onnx>=1.9.0  # ONNX export
 #onnx-simplifier>=0.4.1  # ONNX simplifier
 #tensorflow>=2.4.1  # TFLite export (or tensorflow-cpu, tensorflow-aarch64)
 #openvino-dev  # OpenVINO export
-#git+https://github.com/PINTO0309/openvino2tensorflow #OpenVINO to TFLite export
+#git+https://github.com/PINTO0309/openvino2tensorflow #OpenVINO to TFLite export

strong_sort/reid_multibackend.py

@@ -9,8 +9,8 @@
 from os.path import exists as file_exists
 from .deep.reid_model_factory import show_downloadeable_models, get_model_url, get_model_name
 
-from torchreid.utils import FeatureExtractor
-from torchreid.utils.tools import download_url
+from torchreid.reid.utils import FeatureExtractor
+from torchreid.reid.utils.tools import download_url
 
 
 def check_suffix(file='yolov5s.pt', suffix=('.pt',), msg=''):

strong_sort/sort/nn_matching.py

@@ -3,7 +3,7 @@
 import sys
 import torch
 sys.path.append('strong_sort/deep/reid')
-from torchreid.metrics.distance import compute_distance_matrix
+from torchreid.reid.metrics.distance import compute_distance_matrix
 
 
 def _pdist(a, b):

strong_sort/strong_sort.py

@@ -11,8 +11,8 @@
 from .sort.tracker import Tracker
 from .deep.reid_model_factory import show_downloadeable_models, get_model_url, get_model_name
 
-from torchreid.utils import FeatureExtractor
-from torchreid.utils.tools import download_url
+from torchreid.reid.utils import FeatureExtractor
+from torchreid.reid.utils.tools import download_url
 from .reid_multibackend import ReIDDetectMultiBackend
 
 __all__ = ['StrongSORT']