reid model path would be taken from cli

Author: viplix3

botsort/include/BoTSORT.h

@@ -12,7 +12,8 @@ class BoTSORT
 public:
     explicit BoTSORT(const std::string &tracker_config_path,
                      const std::string &gmc_config_path = "",
-                     const std::string &reid_config_path = "");
+                     const std::string &reid_config_path = "",
+                     const std::string &reid_onnx_model_path = "");
     ~BoTSORT() = default;
 
 

botsort/include/ReID.h

@@ -8,7 +8,8 @@
 class ReIDModel
 {
 public:
-    ReIDModel(const std::string &config_path);
+    ReIDModel(const std::string &config_path,
+              const std::string &onnx_model_path);
     ~ReIDModel() = default;
 
     void pre_process(cv::Mat &image);

botsort/src/BoTSORT.cpp

@@ -12,7 +12,8 @@
 
 BoTSORT::BoTSORT(const std::string &tracker_config_path,
                  const std::string &gmc_config_path,
-                 const std::string &reid_config_path)
+                 const std::string &reid_config_path,
+                 const std::string &reid_onnx_model_path)
 {
     _load_params_from_config(tracker_config_path);
 
@@ -25,8 +26,10 @@ BoTSORT::BoTSORT(const std::string &tracker_config_path,
 
 
     // Re-ID module, load visual feature extractor here
-    if (_reid_enabled && reid_config_path.size() > 0)
-        _reid_model = std::make_unique<ReIDModel>(reid_config_path);
+    if (_reid_enabled && reid_config_path.size() > 0 &&
+        reid_onnx_model_path.size() > 0)
+        _reid_model = std::make_unique<ReIDModel>(reid_config_path,
+                                                  reid_onnx_model_path);
     else
     {
         std::cout << "Re-ID module disabled" << std::endl;

botsort/src/ReID.cpp

@@ -2,10 +2,13 @@
 
 #include "INIReader.h"
 
-ReIDModel::ReIDModel(const std::string &config_path)
+ReIDModel::ReIDModel(const std::string &config_path,
+                     const std::string &onnx_model_path)
 {
     std::cout << "Initializing ReID model" << std::endl;
     _load_params_from_config(config_path);
+
+    _onnx_model_path = onnx_model_path;
     _trt_inference_engine =
             std::make_unique<inference_backend::TensorRTInferenceEngine>(
                     _model_optimization_params, _trt_logging_level);
@@ -52,7 +55,6 @@ void ReIDModel::_load_params_from_config(const std::string &config_path)
         exit(1);
     }
 
-    _onnx_model_path = reid_config.Get(section_name, "onnx_model_path", "");
     _distance_metric =
             reid_config.Get(section_name, "distance_metric", "euclidean");
     _trt_logging_level =

config/reid.ini

@@ -1,5 +1,4 @@
 [ReID]
-onnx_model_path = assets/osnet_x0_25_market1501.onnx    ; models/reid_model.onnx or models/reid_model_fp16.onnx.
 enable_TF32 = true                                      ; if ReID is enabled, set this to enable TF32 inference
 enable_FP16 = true                                      ; if re-id is enabled (i.e. model_path is not commented out), set this to true if you want to use fp16 inference
 input_layer_name = images                               ; layer name of the input layer in the ONNX model

examples/botsort_tracking_example.cpp

@@ -207,12 +207,13 @@ int main(int argc, char **argv)
         std::cout << "Usage eg. 2: ./botsort_tracking_example "
                      "<tracker_config_path> "
                      "<gmc_config_path> <reid_config_path> "
+                     "<reid_onnx_model_path> "
                      "<source> <dir_containing_per_frame_detections> "
                      "<dir_to_save_mot_format_output> <gt_file>"
                   << std::endl;
         return -1;
     }
-    else if (4 < argc && argc < 7)
+    else if (4 < argc && argc < 8)
     {
         std::cout << "Usage eg. 1: ./botsort_tracking_example <source> "
                      "<dir_containing_per_frame_detections> "
@@ -221,15 +222,16 @@ int main(int argc, char **argv)
         std::cout << "Usage eg. 2: ./botsort_tracking_example "
                      "<tracker_config_path> "
                      "<gmc_config_path> <reid_config_path> "
+                     "<reid_onnx_model_path> "
                      "<source> <dir_containing_per_frame_detections> "
                      "<dir_to_save_mot_format_output> <gt_file>"
                   << std::endl;
         return -1;
     }
 
 
-    std::string tracker_config_path, gmc_config_path, reid_config_path, source,
-            labels_dir, output_dir, gt_filepath;
+    std::string tracker_config_path, gmc_config_path, reid_config_path,
+            reid_onnx_model_path, source, labels_dir, output_dir, gt_filepath;
 
     if (argc == 4)
     {
@@ -242,9 +244,10 @@ int main(int argc, char **argv)
         tracker_config_path = argv[1];
         gmc_config_path = argv[2];
         reid_config_path = argv[3];
-        source = argv[4];
-        labels_dir = argv[5];
-        output_dir = argv[6];
+        reid_onnx_model_path = argv[4];
+        source = argv[5];
+        labels_dir = argv[6];
+        output_dir = argv[7];
     }
 
 
@@ -309,7 +312,8 @@ int main(int argc, char **argv)
     else
     {
         tracker = std::make_unique<BoTSORT>(tracker_config_path,
-                                            gmc_config_path, reid_config_path);
+                                            gmc_config_path, reid_config_path,
+                                            reid_onnx_model_path);
     }
 
     if (is_video)