From 7e5f7f3f140b048d97f751b2e148065eb039a572 Mon Sep 17 00:00:00 2001
From: Scheaven <xuepengqiang>
Date: 星期四, 03 六月 2021 16:21:16 +0800
Subject: [PATCH] add m

---
 main.cpp       |   15 ++++-----------
 CMakeLists.txt |   28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f333a6..eab54c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,24 +71,23 @@
 endif()
 
 
-# set(OPENCV_DIR /data/disk2/opt/01_opencv/opencv3.4.8)
-set(OPENCV_DIR /data/disk2/opt/01_opencv/opencv2.4.13)
+set(OPENCV_DIR /opt/toolkits/opencv)
 
-link_directories(/usr/local/cuda-10.0/lib64)
+link_directories(/usr/local/cuda/lib64)
 #link_directories(/usr/local/lib)
 
 SET(LIBS
 		gomp
 		nvToolsExt
 		opencv_core
-		opencv_highgui
-		# opencv_imgcodecs
-		opencv_imgproc
-		# opencv_videoio
-		opencv_video
-		opencv_calib3d
-		opencv_features2d
-		opencv_flann
+        opencv_highgui
+        opencv_imgcodecs
+        opencv_imgproc
+        opencv_videoio
+        opencv_video
+        opencv_calib3d
+        opencv_features2d
+        opencv_flann
 		cublas
 		stdc++fs  #璁剧疆-lstdc++fs 鏂伴摼鎺ュ櫒閫夐」锛岄槻姝td绛塯cc搴撹皟鐢ㄤ笉鍒�
 		curand
@@ -101,7 +100,7 @@
 #aux_source_directory(./src DIR_SRCS)  # 鎼滅储褰撳墠鐩綍涓嬬殑鎵�鏈�.cpp鏂囦欢
 #add_library(demo ${SRC_LIST})   #鏄庣‘鎸囧畾鍖呭惈鍝簺婧愭枃浠�
 
-include_directories(/usr/local/cuda-10.0/include)
+include_directories(/usr/local/cuda/include)
 include_directories(".")
 include_directories("./lib")
 include_directories("./lib/core")
@@ -111,14 +110,15 @@
 #include_directories("/usr/include/json/")
 #include_directories("/usr/include")
 #include_directories("/usr/local/include/")
-include_directories(${OPENCV_DIR}/include)
+include_directories(${OPENCV_DIR}/include/opencv4)
 
 #璁剧疆閾炬帴搴撴悳绱㈢洰褰曪紝椤圭洰涓璴ib璺緞
 link_directories(${PYTORCH_DIR}/lib)  #鍔ㄦ�侀摼鎺ュ簱鐩綍/bazel-bin/tensorflow
 #link_directories(/usr/local/lib)
 link_directories(${OPENCV_DIR}/lib)
 #link_directories(/usr/lib/x86_64-linux-gnu/)
-link_directories(/home/scheaven/anaconda3/lib/)
+link_directories(/home/basic/anaconda3/lib/)
+
 
 
 #娣诲姞瑕佺紪璇戠殑鍙墽琛屾枃浠�
diff --git a/main.cpp b/main.cpp
index 2127ec4..f604bf6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,14 +5,8 @@
 #include "std_target.h"
 #include "time.h"
 
-
-#ifdef OPENCV
 #include <opencv2/opencv.hpp>			// C++
-#pragma comment(lib, "opencv_core249.lib")
-#pragma comment(lib, "opencv_imgproc249.lib")
-#pragma comment(lib, "opencv_highgui249.lib")
 
-#endif	// OPENCV
 using namespace std;
 using namespace cv;
 void* handle;
@@ -39,7 +33,7 @@
     TImage *img = new TImage();
     TImage *img2 = new TImage();
     int i = 0;
-    cap = VideoCapture("/data/disk2/01_dataset/03_human/34983128.mp4");
+    cap = VideoCapture("/data/disk2/01_Scheaven/data/cam_53.avi");
 
     // string path="/data/disk1/workspace/07_CPP/build/re";
     // std::vector<string> video_path_vec;
@@ -48,7 +42,8 @@
 
     // for (auto& file:video_path_vec)
     // {
-    while(1){        /* code */
+    while(1)
+    {        /* code */
         // printf("----start--%s\n", file);
         // cout<<"----------------\n\n"<<file<<endl;
         // frame = imread(file);
@@ -68,7 +63,6 @@
             cout << "=======t_result->count==" << t_result->count  << endl;
             for (int i=0; i<t_result->count; i++)
                 cout << "====1111111111===confidence:" << t_result->targets[i].confidence << endl;
-
             // if (t_result->count>0)
             // {
             //    imwrite("/data/disk2/01_dataset/03_human/02_person/positive/"+file.substr(file.find_last_of("/")), frame);
@@ -76,7 +70,6 @@
             // {
             //     imwrite("/data/disk2/01_dataset/03_human/02_person/negate/"+file.substr(file.find_last_of("/")), frame);
             // }
-
 
         }else{
             cout << "-----------------------over--" << endl;
@@ -86,7 +79,7 @@
         }
 
         clock_t t_strat3 = clock();
-        cout << "rps---"<< CLOCKS_PER_SEC/(t_strat3 - t_strat2)  <<endl;
+        cout << "rps---"<< CLOCKS_PER_SEC/(t_strat3 - t_strat2) <<endl;
     }
     return 0;
 }

--
Gitblit v1.8.0