fix register plugin and cmp

wang-xinyu · wang-xinyu · commit 14906b2cef4e · 2020-08-28T19:30:17.000+08:00
diff --git a/yolov3-spp/CMakeLists.txt b/yolov3-spp/CMakeLists.txt
@@ -28,6 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Ofast -Wfatal-errors -
 
 #cuda_add_library(leaky ${PROJECT_SOURCE_DIR}/leaky.cu)
 cuda_add_library(yololayer SHARED ${PROJECT_SOURCE_DIR}/yololayer.cu)
+target_link_libraries(yololayer nvinfer cudart)
 
 find_package(OpenCV)
 include_directories(OpenCV_INCLUDE_DIRS)
diff --git a/yolov3-spp/yololayer.h b/yolov3-spp/yololayer.h
@@ -151,9 +151,7 @@ namespace nvinfer1
             static PluginFieldCollection mFC;
             static std::vector<PluginField> mPluginAttributes;
     };
-
-
-
+    REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 };
 
 #endif 
diff --git a/yolov3-spp/yolov3-spp.cpp b/yolov3-spp/yolov3-spp.cpp
@@ -37,7 +37,6 @@ static const int OUTPUT_SIZE = 1000 * 7 + 1;  // we assume the yololayer outputs
 const char* INPUT_BLOB_NAME = "data";
 const char* OUTPUT_BLOB_NAME = "prob";
 static Logger gLogger;
-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 
 cv::Mat preprocess_img(cv::Mat& img) {
     int w, h, x, y;
@@ -102,7 +101,7 @@ float iou(float lbox[4], float rbox[4]) {
     return interBoxS/(lbox[2]*lbox[3] + rbox[2]*rbox[3] -interBoxS);
 }
 
-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {
+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {
     return a.det_confidence > b.det_confidence;
 }
 
diff --git a/yolov3-tiny/CMakeLists.txt b/yolov3-tiny/CMakeLists.txt
@@ -28,6 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Ofast -Wfatal-errors -
 
 #cuda_add_library(leaky ${PROJECT_SOURCE_DIR}/leaky.cu)
 cuda_add_library(yololayer SHARED ${PROJECT_SOURCE_DIR}/yololayer.cu)
+target_link_libraries(yololayer nvinfer cudart)
 
 find_package(OpenCV)
 include_directories(OpenCV_INCLUDE_DIRS)
diff --git a/yolov3-tiny/yololayer.h b/yolov3-tiny/yololayer.h
@@ -142,9 +142,7 @@ namespace nvinfer1
             static PluginFieldCollection mFC;
             static std::vector<PluginField> mPluginAttributes;
     };
-
-
-
+    REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 };
 
 #endif 
diff --git a/yolov3-tiny/yolov3-tiny.cpp b/yolov3-tiny/yolov3-tiny.cpp
@@ -36,7 +36,6 @@ static const int OUTPUT_SIZE = 1000 * 7 + 1;  // we assume the yololayer outputs
 const char* INPUT_BLOB_NAME = "data";
 const char* OUTPUT_BLOB_NAME = "prob";
 static Logger gLogger;
-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 
 cv::Mat preprocess_img(cv::Mat& img) {
     int w, h, x, y;
@@ -101,7 +100,7 @@ float iou(float lbox[4], float rbox[4]) {
     return interBoxS/(lbox[2]*lbox[3] + rbox[2]*rbox[3] -interBoxS);
 }
 
-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {
+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {
     return a.det_confidence > b.det_confidence;
 }
 
diff --git a/yolov3/CMakeLists.txt b/yolov3/CMakeLists.txt
@@ -28,6 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Ofast -Wfatal-errors -
 
 #cuda_add_library(leaky ${PROJECT_SOURCE_DIR}/leaky.cu)
 cuda_add_library(yololayer SHARED ${PROJECT_SOURCE_DIR}/yololayer.cu)
+target_link_libraries(yololayer nvinfer cudart)
 
 find_package(OpenCV)
 include_directories(OpenCV_INCLUDE_DIRS)
diff --git a/yolov3/yololayer.h b/yolov3/yololayer.h
@@ -151,9 +151,7 @@ namespace nvinfer1
             static PluginFieldCollection mFC;
             static std::vector<PluginField> mPluginAttributes;
     };
-
-
-
+    REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 };
 
 #endif 
diff --git a/yolov3/yolov3.cpp b/yolov3/yolov3.cpp
@@ -37,7 +37,6 @@ static const int OUTPUT_SIZE = 1000 * 7 + 1;  // we assume the yololayer outputs
 const char* INPUT_BLOB_NAME = "data";
 const char* OUTPUT_BLOB_NAME = "prob";
 static Logger gLogger;
-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 
 cv::Mat preprocess_img(cv::Mat& img) {
     int w, h, x, y;
@@ -102,7 +101,7 @@ float iou(float lbox[4], float rbox[4]) {
     return interBoxS/(lbox[2]*lbox[3] + rbox[2]*rbox[3] -interBoxS);
 }
 
-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {
+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {
     return a.det_confidence > b.det_confidence;
 }
 
diff --git a/yolov4/CMakeLists.txt b/yolov4/CMakeLists.txt
@@ -27,6 +27,7 @@ endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Ofast -Wfatal-errors -D_MWAITXINTRIN_H_INCLUDED")
 
 cuda_add_library(myplugins SHARED ${PROJECT_SOURCE_DIR}/yololayer.cu ${PROJECT_SOURCE_DIR}/mish.cu)
+target_link_libraries(myplugins nvinfer cudart)
 
 find_package(OpenCV)
 include_directories(OpenCV_INCLUDE_DIRS)
diff --git a/yolov4/mish.h b/yolov4/mish.h
@@ -102,5 +102,6 @@ namespace nvinfer1
             static PluginFieldCollection mFC;
             static std::vector<PluginField> mPluginAttributes;
     };
+    REGISTER_TENSORRT_PLUGIN(MishPluginCreator);
 };
 #endif 
diff --git a/yolov4/yololayer.h b/yolov4/yololayer.h
@@ -152,9 +152,7 @@ namespace nvinfer1
             static PluginFieldCollection mFC;
             static std::vector<PluginField> mPluginAttributes;
     };
-
-
-
+    REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 };
 
 #endif 
diff --git a/yolov4/yolov4.cpp b/yolov4/yolov4.cpp
@@ -40,8 +40,6 @@ static const int OUTPUT_SIZE = Yolo::MAX_OUTPUT_BBOX_COUNT * DETECTION_SIZE + 1;
 const char* INPUT_BLOB_NAME = "data";
 const char* OUTPUT_BLOB_NAME = "prob";
 static Logger gLogger;
-REGISTER_TENSORRT_PLUGIN(MishPluginCreator);
-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);
 
 cv::Mat preprocess_img(cv::Mat& img) {
     int w, h, x, y;
@@ -106,7 +104,7 @@ float iou(float lbox[4], float rbox[4]) {
     return interBoxS/(lbox[2]*lbox[3] + rbox[2]*rbox[3] -interBoxS);
 }
 
-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {
+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {
     return a.det_confidence > b.det_confidence;
 }
 
diff --git a/yolov5/README.md b/yolov5/README.md
@@ -5,7 +5,7 @@ The Pytorch implementation is [ultralytics/yolov5](https://github.com/ultralytic
 Currently, we support yolov5 v1.0(yolov5s only), v2.0 and v3.0.
 
 - For yolov5 v3.0, please visit [yolov5 release v3.0](https://github.com/ultralytics/yolov5/releases/tag/v3.0), and use the latest commit of this repo.
-- For yolov5 v2.0, please visit [yolov5 release v2.0](https://github.com/ultralytics/yolov5/releases/tag/v2.0), and checkout commit ['7cd092d'](https://github.com/wang-xinyu/tensorrtx/commit/7cd092d38289123442157cf7defab78e816f4440) of this repo or use the latest commit.
+- For yolov5 v2.0, please visit [yolov5 release v2.0](https://github.com/ultralytics/yolov5/releases/tag/v2.0), and checkout commit ['7cd092d'](https://github.com/wang-xinyu/tensorrtx/commit/7cd092d38289123442157cf7defab78e816f4440) of this repo.
 - For yolov5 v1.0, please visit [yolov5 release v1.0](https://github.com/ultralytics/yolov5/releases/tag/v1.0), and checkout commit ['0504551'](https://github.com/wang-xinyu/tensorrtx/commit/0504551c0b7d0bac5f998eda349810ba410715de) of this repo.
 
 ## Config
diff --git a/yolov5/common.hpp b/yolov5/common.hpp
@@ -87,7 +87,7 @@ float iou(float lbox[4], float rbox[4]) {
     return interBoxS/(lbox[2]*lbox[3] + rbox[2]*rbox[3] -interBoxS);
 }
 
-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {
+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {
     return a.conf > b.conf;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ static const int OUTPUT_SIZE = 1000 * 7 + 1; // we assume the yololayer outputs`
`37`	`37`	`const char* INPUT_BLOB_NAME = "data";`
`38`	`38`	`const char* OUTPUT_BLOB_NAME = "prob";`
`39`	`39`	`static Logger gLogger;`
`40`		`-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);`
`41`	`40`
`42`	`41`	`cv::Mat preprocess_img(cv::Mat& img) {`
`43`	`42`	`int w, h, x, y;`
`@@ -102,7 +101,7 @@ float iou(float lbox[4], float rbox[4]) {`
`102`	`101`	`return interBoxS/(lbox[2]lbox[3] + rbox[2]rbox[3] -interBoxS);`
`103`	`102`	`}`
`104`	`103`
`105`		`-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {`
	`104`	`+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {`
`106`	`105`	`return a.det_confidence > b.det_confidence;`
`107`	`106`	`}`
`108`	`107`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ static const int OUTPUT_SIZE = 1000 * 7 + 1; // we assume the yololayer outputs`
`36`	`36`	`const char* INPUT_BLOB_NAME = "data";`
`37`	`37`	`const char* OUTPUT_BLOB_NAME = "prob";`
`38`	`38`	`static Logger gLogger;`
`39`		`-REGISTER_TENSORRT_PLUGIN(YoloPluginCreator);`
`40`	`39`
`41`	`40`	`cv::Mat preprocess_img(cv::Mat& img) {`
`42`	`41`	`int w, h, x, y;`
`@@ -101,7 +100,7 @@ float iou(float lbox[4], float rbox[4]) {`
`101`	`100`	`return interBoxS/(lbox[2]lbox[3] + rbox[2]rbox[3] -interBoxS);`
`102`	`101`	`}`
`103`	`102`
`104`		`-bool cmp(Yolo::Detection& a, Yolo::Detection& b) {`
	`103`	`+bool cmp(const Yolo::Detection& a, const Yolo::Detection& b) {`
`105`	`104`	`return a.det_confidence > b.det_confidence;`
`106`	`105`	`}`
`107`	`106`