模型路径兼容

Hu Chunming
1 parent fbdee5c4
Showing 7 changed files with 12 additions and 12 deletions
src/ai_engine_module/motocycle_hs_process.cpp
src/ai_engine_module/motocycle_hs_process.h
src/ai_engine_module/tricycle_manned_process.cpp
src/ai_engine_module/tricycle_manned_process.h
src/ai_engine_module/truck_manned_process.cpp
src/ai_engine_module/truck_manned_process.h
src/ai_platform/MultiSourceProcess.cpp
@@ -81,11 +81,11 @@ namespace ai_engine_module
             }
         }
-        bool MotorHsProcess::init(int gpu_id)
+        bool MotorHsProcess::init(int gpu_id, string models_dir)
         {
             init_ = false;
-            string model_path = "./models/hs/hs_motor_310p.om" ;
+            string model_path = models_dir + "/models/hs/hs_motor_310p.om" ;
             LOG_INFO("hs_motor 版本：{}  模型路径：{}", hs_motor_getversion(), model_path);
             hs_motor_param param;
@@ -84,7 +84,7 @@ namespace ai_engine_module
             ~MotorHsProcess();
             bool check_initied();
-            bool init(int gpu_id);
+            bool init(int gpu_id, string models_dir);
             bool update_mstreams(const std::vector<task_id_t>& taskIds, vector<DeviceMemory*> vec_det_input_images, const std::vector<onelevel_det_result> &det_results); 
             std::shared_ptr<results_data_t> get_result_by_objectid(const id_t& id, bool do_erase = true);
@@ -29,11 +29,11 @@ namespace ai_engine_module
             }
         }
-        bool TricycleMannedProcess::init(int gpu_id)
+        bool TricycleMannedProcess::init(int gpu_id, string models_dir)
         {
             init_ = false;
-            string model_path = "./models/hs/hs_tricycle_310p.om" ;
+            string model_path = models_dir + "/models/hs/hs_tricycle_310p.om" ;
             LOG_INFO("hs_tri 版本：{}  模型路径：{}", hs_tri_getversion(), model_path);
             hs_tri_param param;
@@ -75,7 +75,7 @@ namespace ai_engine_module
             ~TricycleMannedProcess();
             bool check_initied();
-            bool init(int gpu_id);
+            bool init(int gpu_id, string models_dir);
             bool update_mstreams(const std::vector<task_id_t>& taskIds, vector<DeviceMemory*> vec_det_input_images, const std::vector<onelevel_det_result> &det_results); 
             std::shared_ptr<results_data_t> get_result_by_objectid(const id_t& id, bool do_erase = true);
@@ -29,11 +29,11 @@ namespace ai_engine_module
             }
         }
-        bool TruckMannedProcess::init(int gpu_id)
+        bool TruckMannedProcess::init(int gpu_id, string models_dir)
         {
             init_ = false;
-            string model_path = "./models/hs/hs_truck_310p.om" ;
+            string model_path = models_dir + "/models/hs/hs_truck_310p.om" ;
             LOG_INFO("hs_truck 版本：{}  模型路径：{}", hs_truck_getversion(), model_path);
             hs_truck_param param;
@@ -75,7 +75,7 @@ namespace ai_engine_module
             ~TruckMannedProcess();
             bool check_initied();
-            bool init(int gpu_id);
+            bool init(int gpu_id, string models_dir);
             bool update_mstreams(const std::vector<task_id_t>& taskIds, vector<DeviceMemory*> vec_det_input_images, const std::vector<onelevel_det_result> &det_results); 
             std::shared_ptr<results_data_t> get_result_by_objectid(const id_t& id, bool do_erase = true);
@@ -109,19 +109,19 @@ int CMultiSourceProcess::InitAlgorthim(tsl_aiplatform_param vptParam){
   }
   //三轮车头肩检测
-  if (!tricycle_manned_.init(vptParam.gpuid)) {
+  if (!tricycle_manned_.init(vptParam.gpuid, models_dir)) {
     LOG_FATAL("Init tricycle_hs failed");
     return -1;
   }
   //货车头肩检测
-  if (!truck_manned_.init(vptParam.gpuid)) {
+  if (!truck_manned_.init(vptParam.gpuid, models_dir)) {
     LOG_FATAL("Init truck_hs failed");
     return -1;
   }
   //二轮车头肩检测
-  if (!motor_hsprocess_.init(vptParam.gpuid)) {
+  if (!motor_hsprocess_.init(vptParam.gpuid, models_dir)) {
     LOG_FATAL("Init motor_hs failed");
     return -1;
   }