From 15398c6238a0dc73c5caa9f5cfb87a1c9041e160 Mon Sep 17 00:00:00 2001 From: fiss <2657262686@qq.com> Date: Wed, 16 Aug 2023 10:11:47 +0800 Subject: [PATCH] 模型路径兼容 --- src/ai_engine_module/motocycle_hs_process.cpp | 4 ++-- src/ai_engine_module/motocycle_hs_process.h | 2 +- src/ai_engine_module/tricycle_manned_process.cpp | 4 ++-- src/ai_engine_module/tricycle_manned_process.h | 2 +- src/ai_engine_module/truck_manned_process.cpp | 4 ++-- src/ai_engine_module/truck_manned_process.h | 2 +- src/ai_platform/MultiSourceProcess.cpp | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ai_engine_module/motocycle_hs_process.cpp b/src/ai_engine_module/motocycle_hs_process.cpp index ed16cb5..ef486fc 100644 --- a/src/ai_engine_module/motocycle_hs_process.cpp +++ b/src/ai_engine_module/motocycle_hs_process.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; diff --git a/src/ai_engine_module/motocycle_hs_process.h b/src/ai_engine_module/motocycle_hs_process.h index 3f491f7..3103549 100644 --- a/src/ai_engine_module/motocycle_hs_process.h +++ b/src/ai_engine_module/motocycle_hs_process.h @@ -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& taskIds, vector vec_det_input_images, const std::vector &det_results); std::shared_ptr get_result_by_objectid(const id_t& id, bool do_erase = true); diff --git a/src/ai_engine_module/tricycle_manned_process.cpp b/src/ai_engine_module/tricycle_manned_process.cpp index 5fb2507..65ae125 100644 --- a/src/ai_engine_module/tricycle_manned_process.cpp +++ b/src/ai_engine_module/tricycle_manned_process.cpp @@ -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; diff --git a/src/ai_engine_module/tricycle_manned_process.h b/src/ai_engine_module/tricycle_manned_process.h index 3374f92..f49c60f 100644 --- a/src/ai_engine_module/tricycle_manned_process.h +++ b/src/ai_engine_module/tricycle_manned_process.h @@ -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& taskIds, vector vec_det_input_images, const std::vector &det_results); std::shared_ptr get_result_by_objectid(const id_t& id, bool do_erase = true); diff --git a/src/ai_engine_module/truck_manned_process.cpp b/src/ai_engine_module/truck_manned_process.cpp index 845b963..c1c7a78 100644 --- a/src/ai_engine_module/truck_manned_process.cpp +++ b/src/ai_engine_module/truck_manned_process.cpp @@ -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; diff --git a/src/ai_engine_module/truck_manned_process.h b/src/ai_engine_module/truck_manned_process.h index 7472060..b19b860 100644 --- a/src/ai_engine_module/truck_manned_process.h +++ b/src/ai_engine_module/truck_manned_process.h @@ -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& taskIds, vector vec_det_input_images, const std::vector &det_results); std::shared_ptr get_result_by_objectid(const id_t& id, bool do_erase = true); diff --git a/src/ai_platform/MultiSourceProcess.cpp b/src/ai_platform/MultiSourceProcess.cpp index 959703f..210ee57 100755 --- a/src/ai_platform/MultiSourceProcess.cpp +++ b/src/ai_platform/MultiSourceProcess.cpp @@ -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; } -- libgit2 0.21.4