From b0fdeb41275cf320c8ab2fea379da07a2bd35f08 Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 15 Jun 2021 19:38:13 +0200 Subject: [PATCH 1/6] install targets --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0383add..48590d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,7 @@ foreach(test_SRC ${darknet_SRC}) set(test_NAME test_${test_NAME}) add_executable(${test_NAME} ${test_SRC}) target_link_libraries(${test_NAME} tkDNN) + install(TARGETS ${test_NAME} DESTINATION bin) endforeach() # MOBILENET @@ -131,6 +132,7 @@ target_link_libraries(demo tkDNN) message("install dir:" ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY include/ DESTINATION include/) install(TARGETS tkDNN kernels DESTINATION lib) +install(TARGETS test_rtinference demo map_demo DESTINATION bin) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" # source directory DESTINATION "share/tkDNN/cmake/" # target directory ) From 6d7c456f724c7456afa3c594ddb72d90e6be4926 Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 15 Jun 2021 19:39:34 +0200 Subject: [PATCH 2/6] cmake version fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48590d9..dd900bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.15) project (tkDNN) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) From 8df7d5fd1b55b99e111404f8d06eebb1017e5237 Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 15 Jun 2021 20:31:58 +0200 Subject: [PATCH 3/6] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd900bd..f09375a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ target_link_libraries(kernels ${CUDA_CUBLAS_LIBRARIES}) # External Libraries #------------------------------------------------------------------------------- find_package(Eigen3 REQUIRED) +include_directories("Eigen DIR: " ${EIGEN3_INCLUDE_DIR}) include_directories(${EIGEN3_INCLUDE_DIR}) find_package(OpenCV REQUIRED) From d847a4b8520e7887f40ccfb3cbcd349c19eb08dc Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 15 Jun 2021 20:33:41 +0200 Subject: [PATCH 4/6] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f09375a..4d67e1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ target_link_libraries(kernels ${CUDA_CUBLAS_LIBRARIES}) # External Libraries #------------------------------------------------------------------------------- find_package(Eigen3 REQUIRED) -include_directories("Eigen DIR: " ${EIGEN3_INCLUDE_DIR}) +message("Eigen DIR: " ${EIGEN3_INCLUDE_DIR}) include_directories(${EIGEN3_INCLUDE_DIR}) find_package(OpenCV REQUIRED) From 9b78f143cb3da2392d22b32383b0d8ea4de854ce Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Wed, 16 Jun 2021 14:53:46 +0200 Subject: [PATCH 5/6] Update CMakeLists.txt --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d67e1b..6076459 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,13 @@ if(DEBUG) add_definitions(-DDEBUG) endif() -add_definitions(-DTKDNN_PATH="${CMAKE_CURRENT_SOURCE_DIR}") +if(TKDNN_PATH) + message("SET TKDNN_PATH:"${TKDNN_PATH}) + add_definitions(-DTKDNN_PATH="${TKDNN_PATH}") +else() + add_definitions(-DTKDNN_PATH="${CMAKE_CURRENT_SOURCE_DIR}") +endif() + #------------------------------------------------------------------------------- # CUDA @@ -137,4 +143,6 @@ install(TARGETS test_rtinference demo map_demo DESTINATION bin) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" # source directory DESTINATION "share/tkDNN/cmake/" # target directory ) - +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests/" # source directory + DESTINATION "share/tkDNN/tests" # target directory +) From c306b368608893e92925bf143e7cf14f19525aeb Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Thu, 17 Jun 2021 15:31:25 +0200 Subject: [PATCH 6/6] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6076459..f03c98c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ target_link_libraries(demo tkDNN) message("install dir:" ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY include/ DESTINATION include/) install(TARGETS tkDNN kernels DESTINATION lib) -install(TARGETS test_rtinference demo map_demo DESTINATION bin) +install(TARGETS test_simple test_mnist test_mnistRT test_rtinference demo map_demo DESTINATION bin) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" # source directory DESTINATION "share/tkDNN/cmake/" # target directory )