From ca62784f57d177e3fc9e5ec360fc13d44586a2a0 Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 17 Sep 2019 15:22:39 +0200 Subject: [PATCH] include dir fix, cmake dir --- CMakeLists.txt | 5 ++--- tkDNNConfig.cmake => cmake/tkDNNConfig.cmake | 0 include/{ => tkDNN}/Layer.h | 0 include/{ => tkDNN}/Network.h | 0 include/{ => tkDNN}/NetworkRT.h | 0 include/{ => tkDNN}/Yolo3Detection.h | 0 include/{ => tkDNN}/kernels.h | 0 include/{ => tkDNN}/models/Yolo3.h | 0 include/{ => tkDNN}/pluginsRT/ActivationLeakyRT.h | 0 include/{ => tkDNN}/pluginsRT/Int8Calibrator.h | 0 include/{ => tkDNN}/pluginsRT/RegionRT.h | 0 include/{ => tkDNN}/pluginsRT/ReorgRT.h | 0 include/{ => tkDNN}/pluginsRT/RouteRT.h | 0 include/{ => tkDNN}/pluginsRT/ShortcutRT.h | 0 include/{ => tkDNN}/pluginsRT/UpsampleRT.h | 0 include/{ => tkDNN}/pluginsRT/YoloRT.h | 0 include/{ => tkDNN}/tkdnn.h | 0 include/{ => tkDNN}/utils.h | 0 18 files changed, 2 insertions(+), 3 deletions(-) rename tkDNNConfig.cmake => cmake/tkDNNConfig.cmake (100%) rename include/{ => tkDNN}/Layer.h (100%) rename include/{ => tkDNN}/Network.h (100%) rename include/{ => tkDNN}/NetworkRT.h (100%) rename include/{ => tkDNN}/Yolo3Detection.h (100%) rename include/{ => tkDNN}/kernels.h (100%) rename include/{ => tkDNN}/models/Yolo3.h (100%) rename include/{ => tkDNN}/pluginsRT/ActivationLeakyRT.h (100%) rename include/{ => tkDNN}/pluginsRT/Int8Calibrator.h (100%) rename include/{ => tkDNN}/pluginsRT/RegionRT.h (100%) rename include/{ => tkDNN}/pluginsRT/ReorgRT.h (100%) rename include/{ => tkDNN}/pluginsRT/RouteRT.h (100%) rename include/{ => tkDNN}/pluginsRT/ShortcutRT.h (100%) rename include/{ => tkDNN}/pluginsRT/UpsampleRT.h (100%) rename include/{ => tkDNN}/pluginsRT/YoloRT.h (100%) rename include/{ => tkDNN}/tkdnn.h (100%) rename include/{ => tkDNN}/utils.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f94ccbb..a35264c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project (tkDNN) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_BUILD_TYPE "Release") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC") -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/tkDNN) # project specific flags if(DEBUG) @@ -110,8 +110,7 @@ target_link_libraries(yolo3_demo tkDNN) # CACHE PATH "default install path" FORCE) #endif() message("install dir:" ${CMAKE_INSTALL_PREFIX}) -install(DIRECTORY include/ DESTINATION include/${CMAKE_PROJECT_NAME} -FILES_MATCHING PATTERN "*.h") +install(DIRECTORY include/ DESTINATION include/) install(TARGETS tkDNN kernels DESTINATION lib) install(FILES "${CMAKE_SOURCE_DIR}/${CMAKE_PROJECT_NAME}Config.cmake" # source directory DESTINATION "share/${CMAKE_PROJECT_NAME}/cmake/" # target directory diff --git a/tkDNNConfig.cmake b/cmake/tkDNNConfig.cmake similarity index 100% rename from tkDNNConfig.cmake rename to cmake/tkDNNConfig.cmake diff --git a/include/Layer.h b/include/tkDNN/Layer.h similarity index 100% rename from include/Layer.h rename to include/tkDNN/Layer.h diff --git a/include/Network.h b/include/tkDNN/Network.h similarity index 100% rename from include/Network.h rename to include/tkDNN/Network.h diff --git a/include/NetworkRT.h b/include/tkDNN/NetworkRT.h similarity index 100% rename from include/NetworkRT.h rename to include/tkDNN/NetworkRT.h diff --git a/include/Yolo3Detection.h b/include/tkDNN/Yolo3Detection.h similarity index 100% rename from include/Yolo3Detection.h rename to include/tkDNN/Yolo3Detection.h diff --git a/include/kernels.h b/include/tkDNN/kernels.h similarity index 100% rename from include/kernels.h rename to include/tkDNN/kernels.h diff --git a/include/models/Yolo3.h b/include/tkDNN/models/Yolo3.h similarity index 100% rename from include/models/Yolo3.h rename to include/tkDNN/models/Yolo3.h diff --git a/include/pluginsRT/ActivationLeakyRT.h b/include/tkDNN/pluginsRT/ActivationLeakyRT.h similarity index 100% rename from include/pluginsRT/ActivationLeakyRT.h rename to include/tkDNN/pluginsRT/ActivationLeakyRT.h diff --git a/include/pluginsRT/Int8Calibrator.h b/include/tkDNN/pluginsRT/Int8Calibrator.h similarity index 100% rename from include/pluginsRT/Int8Calibrator.h rename to include/tkDNN/pluginsRT/Int8Calibrator.h diff --git a/include/pluginsRT/RegionRT.h b/include/tkDNN/pluginsRT/RegionRT.h similarity index 100% rename from include/pluginsRT/RegionRT.h rename to include/tkDNN/pluginsRT/RegionRT.h diff --git a/include/pluginsRT/ReorgRT.h b/include/tkDNN/pluginsRT/ReorgRT.h similarity index 100% rename from include/pluginsRT/ReorgRT.h rename to include/tkDNN/pluginsRT/ReorgRT.h diff --git a/include/pluginsRT/RouteRT.h b/include/tkDNN/pluginsRT/RouteRT.h similarity index 100% rename from include/pluginsRT/RouteRT.h rename to include/tkDNN/pluginsRT/RouteRT.h diff --git a/include/pluginsRT/ShortcutRT.h b/include/tkDNN/pluginsRT/ShortcutRT.h similarity index 100% rename from include/pluginsRT/ShortcutRT.h rename to include/tkDNN/pluginsRT/ShortcutRT.h diff --git a/include/pluginsRT/UpsampleRT.h b/include/tkDNN/pluginsRT/UpsampleRT.h similarity index 100% rename from include/pluginsRT/UpsampleRT.h rename to include/tkDNN/pluginsRT/UpsampleRT.h diff --git a/include/pluginsRT/YoloRT.h b/include/tkDNN/pluginsRT/YoloRT.h similarity index 100% rename from include/pluginsRT/YoloRT.h rename to include/tkDNN/pluginsRT/YoloRT.h diff --git a/include/tkdnn.h b/include/tkDNN/tkdnn.h similarity index 100% rename from include/tkdnn.h rename to include/tkDNN/tkdnn.h diff --git a/include/utils.h b/include/tkDNN/utils.h similarity index 100% rename from include/utils.h rename to include/tkDNN/utils.h