同步代码

Hu Chunming
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
vehicle_structure_platform.git0708-3080-trt-face/src/VPT/snapshot_analysis/VPTProcess.h
@@ -2,9 +2,9 @@
  
 #include <stdlib.h>
 #include <cuda_runtime.h>
-#include "ErrorInfo.h"
  
-#include "../utils/logger.hpp"
+#include "../ErrorInfo.h"
+#include "../../utils/logger.hpp"
  
 #define THRESHOLD 0.5
  
@@ -17,8 +17,8 @@
 // //#include "../../model/hidemodel_caffe_1108/ga_vpt_predict_net_caffe2.h"
  
 //model trt onnx 20210715
-#include "../../model/vptModeTrt/ga_vpt_det_yolo_640x640.h" // debug by zsh
-#include "../../model/vptModeTrt/ga_trt_yolo_vpt_calibrator.h" // debug by zsh
+#include "../../../model/vptModeTrt/ga_vpt_det_yolo_640x640.h" // debug by zsh
+#include "../../../model/vptModeTrt/ga_trt_yolo_vpt_calibrator.h" // debug by zsh
  
 // // fpn
 // #include "vpt_fpn_plugin_factory.h"
@@ -44,7 +44,6 @@ static long long get_cur_time_ms(){
  
 VPTProcess::VPTProcess(/* args */)
 {
-	m_taskTrackerMap.clear();
 }
  
 VPTProcess::~VPTProcess()
@@ -158,7 +157,7 @@ int VPTProcess::init(int gpuid, int max_batch_size)
 	param.device_type_ = DEVICE_GPU;
 	param.device_id_ = gpuid;
 	param.engine_type_ = ENGINE_TENSORRT;
-	param.trt_serialize_file_ = "./serialize_file/VPT";
+	param.trt_serialize_file_ = "./serialize_file/V_VPT";
  
 	m_max_batch_size = max_batch_size;
  
@@ -294,10 +293,10 @@ vector&lt;VPTProcessResult&gt; VPTProcess::process(vector&lt;DataInfo&gt; vec_data) {
 			// 非第一帧
 			int update_times = det_result_info.ts - task_tracker.lastFrameIndex - 1;
 			if (update_times < 0) {
-				cout << "FrameIndex error !! lastFrameIndex= " << task_tracker.lastFrameIndex << " cur_frameindex = " << det_result_info.ts << endl;
+				LOG_ERROR("FrameIndex error !! lastFrameIndex = {}  cur_frameindex = ", task_tracker.lastFrameIndex, det_result_info.ts);
 			}
  
-			cout << "update_times " << update_times << endl;
+			//cout << "update_times " << update_times << endl;
  
 			for (int j = 0; j < update_times; j++) { // 无检测框跟踪
 				VPT_Result unresult;
@@ -10,9 +10,9 @@
 #include "utools.h"
 #include <vector>
 #include <map>
-#include "common.h"
+#include "../common.h"
  
-#include "./sort/Sort.h" //tracker
+#include "../sort/Sort.h" //tracker
  
 using namespace std;