Commit 307ce3ec0067ae0b12bc36286c611885a551136a
1 parent
b944fdeb
同步代码
Showing
2 changed files
with
9 additions
and
10 deletions
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/VPTProcess.cpp
| @@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
| 2 | 2 | ||
| 3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
| 4 | #include <cuda_runtime.h> | 4 | #include <cuda_runtime.h> |
| 5 | -#include "ErrorInfo.h" | ||
| 6 | 5 | ||
| 7 | -#include "../utils/logger.hpp" | 6 | +#include "../ErrorInfo.h" |
| 7 | +#include "../../utils/logger.hpp" | ||
| 8 | 8 | ||
| 9 | #define THRESHOLD 0.5 | 9 | #define THRESHOLD 0.5 |
| 10 | 10 | ||
| @@ -17,8 +17,8 @@ | @@ -17,8 +17,8 @@ | ||
| 17 | // //#include "../../model/hidemodel_caffe_1108/ga_vpt_predict_net_caffe2.h" | 17 | // //#include "../../model/hidemodel_caffe_1108/ga_vpt_predict_net_caffe2.h" |
| 18 | 18 | ||
| 19 | //model trt onnx 20210715 | 19 | //model trt onnx 20210715 |
| 20 | -#include "../../model/vptModeTrt/ga_vpt_det_yolo_640x640.h" // debug by zsh | ||
| 21 | -#include "../../model/vptModeTrt/ga_trt_yolo_vpt_calibrator.h" // debug by zsh | 20 | +#include "../../../model/vptModeTrt/ga_vpt_det_yolo_640x640.h" // debug by zsh |
| 21 | +#include "../../../model/vptModeTrt/ga_trt_yolo_vpt_calibrator.h" // debug by zsh | ||
| 22 | 22 | ||
| 23 | // // fpn | 23 | // // fpn |
| 24 | // #include "vpt_fpn_plugin_factory.h" | 24 | // #include "vpt_fpn_plugin_factory.h" |
| @@ -44,7 +44,6 @@ static long long get_cur_time_ms(){ | @@ -44,7 +44,6 @@ static long long get_cur_time_ms(){ | ||
| 44 | 44 | ||
| 45 | VPTProcess::VPTProcess(/* args */) | 45 | VPTProcess::VPTProcess(/* args */) |
| 46 | { | 46 | { |
| 47 | - m_taskTrackerMap.clear(); | ||
| 48 | } | 47 | } |
| 49 | 48 | ||
| 50 | VPTProcess::~VPTProcess() | 49 | VPTProcess::~VPTProcess() |
| @@ -158,7 +157,7 @@ int VPTProcess::init(int gpuid, int max_batch_size) | @@ -158,7 +157,7 @@ int VPTProcess::init(int gpuid, int max_batch_size) | ||
| 158 | param.device_type_ = DEVICE_GPU; | 157 | param.device_type_ = DEVICE_GPU; |
| 159 | param.device_id_ = gpuid; | 158 | param.device_id_ = gpuid; |
| 160 | param.engine_type_ = ENGINE_TENSORRT; | 159 | param.engine_type_ = ENGINE_TENSORRT; |
| 161 | - param.trt_serialize_file_ = "./serialize_file/VPT"; | 160 | + param.trt_serialize_file_ = "./serialize_file/V_VPT"; |
| 162 | 161 | ||
| 163 | m_max_batch_size = max_batch_size; | 162 | m_max_batch_size = max_batch_size; |
| 164 | 163 | ||
| @@ -294,10 +293,10 @@ vector<VPTProcessResult> VPTProcess::process(vector<DataInfo> vec_data) { | @@ -294,10 +293,10 @@ vector<VPTProcessResult> VPTProcess::process(vector<DataInfo> vec_data) { | ||
| 294 | // 非第一帧 | 293 | // 非第一帧 |
| 295 | int update_times = det_result_info.ts - task_tracker.lastFrameIndex - 1; | 294 | int update_times = det_result_info.ts - task_tracker.lastFrameIndex - 1; |
| 296 | if (update_times < 0) { | 295 | if (update_times < 0) { |
| 297 | - cout << "FrameIndex error !! lastFrameIndex= " << task_tracker.lastFrameIndex << " cur_frameindex = " << det_result_info.ts << endl; | 296 | + LOG_ERROR("FrameIndex error !! lastFrameIndex = {} cur_frameindex = ", task_tracker.lastFrameIndex, det_result_info.ts); |
| 298 | } | 297 | } |
| 299 | 298 | ||
| 300 | - cout << "update_times " << update_times << endl; | 299 | + //cout << "update_times " << update_times << endl; |
| 301 | 300 | ||
| 302 | for (int j = 0; j < update_times; j++) { // 无检测框跟踪 | 301 | for (int j = 0; j < update_times; j++) { // 无检测框跟踪 |
| 303 | VPT_Result unresult; | 302 | VPT_Result unresult; |
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/VPTProcess.h
| @@ -10,9 +10,9 @@ | @@ -10,9 +10,9 @@ | ||
| 10 | #include "utools.h" | 10 | #include "utools.h" |
| 11 | #include <vector> | 11 | #include <vector> |
| 12 | #include <map> | 12 | #include <map> |
| 13 | -#include "common.h" | 13 | +#include "../common.h" |
| 14 | 14 | ||
| 15 | -#include "./sort/Sort.h" //tracker | 15 | +#include "../sort/Sort.h" //tracker |
| 16 | 16 | ||
| 17 | using namespace std; | 17 | using namespace std; |
| 18 | 18 |