From f7bb0bb5019823183e2498f03ca63d0aeb480a41 Mon Sep 17 00:00:00 2001
From: Scheaven <xuepengqiang>
Date: 星期三, 13 一月 2021 19:03:17 +0800
Subject: [PATCH] update 2021
---
CMakeLists.txt | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24bf497..b65a988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.5)
-#SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -march=native -O0 -Wall -g2 -ggdb")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -fPIC -march=native -DGPU -DCUDNN -DOPENCV -g -std=c++14 -W -O3 -pthread -Wl,--no-as-needed -DS_DEBUG")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -fPIC -lm -march=native -DGPU -DCUDNN -DOPENCV -g -std=c++11 -W -O3 -pthread -Wl,--no-as-needed")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -DGPU -DCUDNN -DOPENCV -g -lm -std=c++11 -fPIC -W -O3 -Wl,--no-as-needed") # 缂栬瘧C鑴氭湰鏃惰皟鐢℅PU鐜淇℃伅
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -fPIC -march=native -DGPU -DCUDNN -DOPENCV -g -W -O0 -pthread -DS_DEBUG")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -fPIC -march=native -DGPU -DCUDNN -DOPENCV -g -W -O0 -pthread -DS_DEBUG -DS_SERVER")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -DEIGEN_MAX_ALIGN_BYTES=32 -DEIGEN_DONT_VECTORIZE -fPIC -lm -march=native -DGPU -DCUDNN -DOPENCV -g -W -O0 -pthread -Wl,--no-as-needed")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -DGPU -DCUDNN -DOPENCV -g -lm -fPIC -W -O0 -Wl,--no-as-needed") # 缂栬瘧C鑴氭湰鏃惰皟鐢℅PU鐜淇℃伅
#set(CMAKE_C_FLAGS "-fvisibility=hidden")
#set(CMAKE_CXX_FLAGS "-fvisibility=hidden")
@@ -13,8 +13,11 @@
#璁剧疆c++缂栬瘧鍣�
set(CMAKE_CXX_STANDARD 11)
+#set(CMAKE_CXX_STANDARD_REQUIRED ON)
+#set(CMAKE_CXX_EXTENSIONS OFF)
+
#set(CMAKE_BUILD_TYPE debug)
-add_compile_options(-fPIC -ldl -lm -g -Wall -Wshadow -Wno-sign-compare -w -pthread)
+add_compile_options(-fPIC -ldl -lm -g -Wall -Wshadow -Wno-sign-compare -w -pthread)
#add_definitions(-DDEBUG_ERR -DDEBUG_INFO)
#add_definitions(-DDEBUG)
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
@@ -24,9 +27,9 @@
./*.h
./lib/*.h
./lib/core/*.h
+ ./lib/utils/*.h
./lib/detecter_tools/*.h
./lib/detecter_tools/extra/*.h
- ./lib/utils/*.h
./lib/detecter_tools/*.hpp
./lib/detecter_tools/*.cuh
./lib/detecter_tools/darknet/*.hpp
@@ -37,19 +40,12 @@
./*.cpp
./lib/*.cpp
./lib/core/*.cpp
- ./lib/detecter_tools/*.cpp
./lib/utils/*.cpp
+ ./lib/detecter_tools/*.cpp
./lib/detecter_tools/*.cpp
./lib/detecter_tools/darknet/*.c
./lib/detecter_tools/darknet/*.cpp
./lib/detecter_tools/darknet/*.cu)
-
-#file(GLOB protobuf_files
-# ./lib/additional/protomsg.proto
-#)
-#foreach(s range ${sources})
-#message(${s})
-#endforeach()
source_group("Include" FILES ${CURRENT_HEADERS})
source_group("Source" FILES ${sources})
@@ -74,13 +70,12 @@
endif()
-set(OPENCV_DIR /home/disk1/s_opt/01_opencv/opencv2.4.13)
+set(OPENCV_DIR /data/disk2/opt/01_opencv/opencv2.4.13)
link_directories(/usr/local/cuda-10.0/lib64)
#link_directories(/usr/local/lib)
SET(LIBS
- cudart
gomp
nvToolsExt
opencv_core
@@ -90,6 +85,8 @@
#opencv_videoio
opencv_video
opencv_calib3d
+ opencv_features2d
+ opencv_flann
cublas
stdc++fs #璁剧疆-lstdc++fs 鏂伴摼鎺ュ櫒閫夐」锛岄槻姝td绛塯cc搴撹皟鐢ㄤ笉鍒�
curand
@@ -102,8 +99,6 @@
#aux_source_directory(./src DIR_SRCS) # 鎼滅储褰撳墠鐩綍涓嬬殑鎵�鏈�.cpp鏂囦欢
#add_library(demo ${SRC_LIST}) #鏄庣‘鎸囧畾鍖呭惈鍝簺婧愭枃浠�
-
-#璁剧疆鍖呭惈鐨勭洰褰曪紝椤圭洰涓殑include璺緞锛屾崲鎴愯嚜宸辩殑璺緞鍗冲彲
include_directories(/usr/local/cuda-10.0/include)
include_directories(".")
include_directories("./lib")
@@ -112,16 +107,16 @@
include_directories("./lib/utils")
#include_directories("/usr/include/x86_64-linux-gnu/")
#include_directories("/usr/include/json/")
-include_directories("/usr/include")
-include_directories("/usr/local/include/")
+#include_directories("/usr/include")
+#include_directories("/usr/local/include/")
include_directories(${OPENCV_DIR}/include)
#璁剧疆閾炬帴搴撴悳绱㈢洰褰曪紝椤圭洰涓璴ib璺緞
+link_directories(${PYTORCH_DIR}/lib) #鍔ㄦ�侀摼鎺ュ簱鐩綍/bazel-bin/tensorflow
+#link_directories(/usr/local/lib)
link_directories(${OPENCV_DIR}/lib)
-link_directories(/usr/local/cuda-10.0/lib64) #鍔ㄦ�侀摼鎺ュ簱鐩綍/bazel-bin/tensorflow
-link_directories(/usr/local/lib) #鍔ㄦ�侀摼鎺ュ簱鐩綍/bazel-bin/tensorflow
-link_directories(/usr/lib/x86_64-linux-gnu/)
-link_directories(/home/basic/anaconda3/lib/)
+#link_directories(/usr/lib/x86_64-linux-gnu/)
+link_directories(/home/scheaven/anaconda3/lib/)
#娣诲姞瑕佺紪璇戠殑鍙墽琛屾枃浠�
@@ -130,9 +125,5 @@
cuda_add_executable(${PROJECT_NAME} SDK_main.cpp ${sources} ${CURRENT_HEADERS})
#cuda_add_library(${PROJECT_NAME} SHARED ${sources} ${CURRENT_HEADERS})
-#add_executable(demo ${DIR_SRCS}) ## 鐢熸垚鍙墽琛屾枃浠�
-
-
#璁剧疆 target 闇�瑕侀摼鎺ョ殑搴�
-#娣诲姞鍙墽琛屾枃浠舵墍闇�瑕佺殑搴�,杩炴帴libtensorflow_cc.so鍜宭ibtensorflow_framework搴擄紝閾炬帴鍔ㄦ�侀摼鎺ュ簱
target_link_libraries(${PROJECT_NAME} ${LIBS})
--
Gitblit v1.8.0