From 874b17d95efc386a685855014a42aecc303e9ef8 Mon Sep 17 00:00:00 2001 From: chenshijun <chenshijun@aiotlink.com> Date: 星期三, 08 九月 2021 18:15:37 +0800 Subject: [PATCH] bug --- demo.cpp | 5 ----- CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78a43c4..481cd61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CUDA_Path /usr/local/cuda) # find_package(OpenCV REQUIRED PATHS "/opt/toolkits/opencv") set(OPENCV_DIR /opt/toolkits/opencv) -set(TensorRT_DIR /opt/toolkits/TensorRT-7.2.3.4) +set(TensorRT_DIR /opt/toolkits/TensorRT7) set(LOG_DIR /opt/toolkits/log4cplus) include_directories(${OPENCV_DIR}/include/opencv4) @@ -22,6 +22,7 @@ link_directories(${LOG_DIR}/lib) include_directories(${LOG_DIR}/include) include_directories("/usr/include/jsoncpp/") +include_directories("/usr/include/eigen3/") file(GLOB_RECURSE sources src/* src/core/* src/utils/* src/detecter_tools/* ${TensorRT_DIR}/samples/common/*.h ${TensorRT_DIR}/samples/common/logger.cpp) set(LIBS nvinfer nvparsers nvonnxparser nvinfer_plugin stdc++fs jsoncpp log4cplus opencv_core opencv_highgui opencv_imgcodecs @@ -32,7 +33,6 @@ endif(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) -# find_package(CUDA REQUIRED) if(CUDA_VERSION_MAJOR GREATER 9) message("-- CUDA ${CUDA_VERSION_MAJOR} detected") diff --git a/demo.cpp b/demo.cpp index 29242d6..804ab43 100644 --- a/demo.cpp +++ b/demo.cpp @@ -48,11 +48,6 @@ for (int i=0; i<t_result->count; i++) { cout << "confidence:" << t_result->targets[i].confidence << endl; -<<<<<<< HEAD - //draw_SDK_result(frame, t_result->targets[i]); -======= - // draw_SDK_result(frame, t_result->targets[i]); ->>>>>>> e47cdf6abec38e5249f5258bc7b98824b67eb79f } }else{ cout << "------------over--" << endl; -- Gitblit v1.8.0