Rename TensorRT YOLO directory

homeskies · Aug 14, 2020 · 5fc8ef5 · 5fc8ef5
1 parent cf85164
commit 5fc8ef5
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/uw_detection/CMakeLists.txt b/uw_detection/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(uw_detection)
 
-find_package(catkin REQUIRED COMPONENTS   cv_bridge
+find_package(catkin REQUIRED COMPONENTS
+        cv_bridge
         geometry_msgs
         image_transport
         message_generation
@@ -23,9 +24,8 @@ catkin_package()
 
 option(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_BUILD_TYPE Debug)
 
-find_package(OpenCV)
+find_package(OpenCV REQUIRED)
 include_directories(OpenCV_INCLUDE_DIRS
         ${catkin_INCLUDE_DIRS}
         include)
@@ -47,18 +47,18 @@ else()
 endif()
 
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Ofast -Wfatal-errors -D_MWAITXINTRIN_H_INCLUDED")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Ofast -Wfatal-errors -D_MWAITXINTRIN_H_INCLUDED")
 
-cuda_add_library(yololayer SHARED src/yolov3-spp/yololayer.cu)
+cuda_add_library(yololayer SHARED src/yolov3/yololayer.cu)
 
-add_library(yolov3-spp src/yolov3-spp/yolov3-spp.cpp)
+add_library(yolov3-spp src/yolov3/yolov3-spp.cpp)
 target_link_libraries(yolov3-spp nvinfer cudart yololayer ${OpenCV_LIBS})
 
-add_library(yolov3 src/yolov3-spp/yolov3.cpp)
+add_library(yolov3 src/yolov3/yolov3.cpp)
 target_link_libraries(yolov3 nvinfer cudart yololayer ${OpenCV_LIBS})
 
 add_executable(yolov3_spp_prepare_plan src/yolov3_spp_prepare_plan.cpp)
-target_link_libraries(yolov3_spp_prepare_plan yolov3-spp nvinfer cudart yololayer ${OpenCV_LIBS} ${catkin_LIBRARIES})
+target_link_libraries(yolov3_spp_prepare_plan yolov3 nvinfer cudart yololayer ${OpenCV_LIBS} ${catkin_LIBRARIES})
 
 add_executable(yolov3_prepare_plan src/yolov3_prepare_plan.cpp)
 target_link_libraries(yolov3_prepare_plan yolov3 nvinfer cudart yololayer ${OpenCV_LIBS} ${catkin_LIBRARIES})

diff --git a/uw_detection/src/yolov3-spp/.gitignore → uw_detection/src/yolov3/.gitignore b/uw_detection/src/yolov3-spp/.gitignore → uw_detection/src/yolov3/.gitignore
diff --git a/uw_detection/src/yolov3-spp/README.md → uw_detection/src/yolov3/README.md b/uw_detection/src/yolov3-spp/README.md → uw_detection/src/yolov3/README.md
diff --git a/uw_detection/src/yolov3-spp/gen_wts.py → uw_detection/src/yolov3/gen_wts.py b/uw_detection/src/yolov3-spp/gen_wts.py → uw_detection/src/yolov3/gen_wts.py
diff --git a/uw_detection/src/yolov3-spp/gen_wts_spp.py → uw_detection/src/yolov3/gen_wts_spp.py b/uw_detection/src/yolov3-spp/gen_wts_spp.py → uw_detection/src/yolov3/gen_wts_spp.py
diff --git a/uw_detection/src/yolov3-spp/samples/bus.jpg → uw_detection/src/yolov3/samples/bus.jpg b/uw_detection/src/yolov3-spp/samples/bus.jpg → uw_detection/src/yolov3/samples/bus.jpg
diff --git a/...tection/src/yolov3-spp/samples/zidane.jpg → uw_detection/src/yolov3/samples/zidane.jpg b/...tection/src/yolov3-spp/samples/zidane.jpg → uw_detection/src/yolov3/samples/zidane.jpg
diff --git a/uw_detection/src/yolov3-spp/yololayer.cu → uw_detection/src/yolov3/yololayer.cu b/uw_detection/src/yolov3-spp/yololayer.cu → uw_detection/src/yolov3/yololayer.cu
diff --git a/uw_detection/src/yolov3-spp/yolov3-spp.cpp → uw_detection/src/yolov3/yolov3-spp.cpp b/uw_detection/src/yolov3-spp/yolov3-spp.cpp → uw_detection/src/yolov3/yolov3-spp.cpp
diff --git a/uw_detection/src/yolov3-spp/yolov3.cpp → uw_detection/src/yolov3/yolov3.cpp b/uw_detection/src/yolov3-spp/yolov3.cpp → uw_detection/src/yolov3/yolov3.cpp