From 2b0899329bc778886f6ea95dbd01ff303f750a22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Mon, 13 May 2019 11:12:39 +0900 Subject: [PATCH] Extract nnkit-caffe (#3435) This commit extracts nnkit-caffe from nnkit, and simplifes the depedency check in CMakeLists.txt. Signed-off-by: Jonghyun Park --- contrib/nnkit-caffe/CMakeLists.txt | 8 ++++++++ .../{nnkit/backends/caffe => nnkit-caffe/backend}/CMakeLists.txt | 4 ---- contrib/{nnkit/backends/caffe => nnkit-caffe/backend}/Module.cpp | 0 contrib/nnkit-caffe/requires.cmake | 1 + .../libs/support/caffe => nnkit-caffe/support}/CMakeLists.txt | 6 ------ .../support}/include/nnkit/support/caffe/Backend.h | 0 .../support}/include/nnkit/support/caffe/BlobContext.h | 0 .../support}/include/nnkit/support/caffe/InputBlobContext.h | 0 .../support}/include/nnkit/support/caffe/OutputBlobContext.h | 0 .../support}/include/nnkit/support/caffe/TensorContext.h | 0 contrib/nnkit/requires.cmake | 1 + 11 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 contrib/nnkit-caffe/CMakeLists.txt rename contrib/{nnkit/backends/caffe => nnkit-caffe/backend}/CMakeLists.txt (65%) rename contrib/{nnkit/backends/caffe => nnkit-caffe/backend}/Module.cpp (100%) create mode 100644 contrib/nnkit-caffe/requires.cmake rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/CMakeLists.txt (73%) rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/include/nnkit/support/caffe/Backend.h (100%) rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/include/nnkit/support/caffe/BlobContext.h (100%) rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/include/nnkit/support/caffe/InputBlobContext.h (100%) rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/include/nnkit/support/caffe/OutputBlobContext.h (100%) rename contrib/{nnkit/libs/support/caffe => nnkit-caffe/support}/include/nnkit/support/caffe/TensorContext.h (100%) diff --git a/contrib/nnkit-caffe/CMakeLists.txt b/contrib/nnkit-caffe/CMakeLists.txt new file mode 100644 index 0000000..53954d0 --- /dev/null +++ b/contrib/nnkit-caffe/CMakeLists.txt @@ -0,0 +1,8 @@ +nncc_find_package(Caffe QUIET) + +if(NOT Caffe_FOUND) + return() +endif(NOT Caffe_FOUND) + +add_subdirectory(support) +add_subdirectory(backend) diff --git a/contrib/nnkit/backends/caffe/CMakeLists.txt b/contrib/nnkit-caffe/backend/CMakeLists.txt similarity index 65% rename from contrib/nnkit/backends/caffe/CMakeLists.txt rename to contrib/nnkit-caffe/backend/CMakeLists.txt index 125822a..b18aa4f 100644 --- a/contrib/nnkit/backends/caffe/CMakeLists.txt +++ b/contrib/nnkit-caffe/backend/CMakeLists.txt @@ -1,7 +1,3 @@ -if(NOT TARGET nnkit_support_caffe) - return() -endif(NOT TARGET nnkit_support_caffe) - add_library(nnkit_caffe_backend SHARED Module.cpp) target_link_libraries(nnkit_caffe_backend nnkit_support_caffe) target_link_libraries(nnkit_caffe_backend stdex) diff --git a/contrib/nnkit/backends/caffe/Module.cpp b/contrib/nnkit-caffe/backend/Module.cpp similarity index 100% rename from contrib/nnkit/backends/caffe/Module.cpp rename to contrib/nnkit-caffe/backend/Module.cpp diff --git a/contrib/nnkit-caffe/requires.cmake b/contrib/nnkit-caffe/requires.cmake new file mode 100644 index 0000000..be53ae7 --- /dev/null +++ b/contrib/nnkit-caffe/requires.cmake @@ -0,0 +1 @@ +require("nnkit-intf") diff --git a/contrib/nnkit/libs/support/caffe/CMakeLists.txt b/contrib/nnkit-caffe/support/CMakeLists.txt similarity index 73% rename from contrib/nnkit/libs/support/caffe/CMakeLists.txt rename to contrib/nnkit-caffe/support/CMakeLists.txt index 91a2a71..d56622c 100644 --- a/contrib/nnkit/libs/support/caffe/CMakeLists.txt +++ b/contrib/nnkit-caffe/support/CMakeLists.txt @@ -1,9 +1,3 @@ -nncc_find_package(Caffe QUIET) - -if(NOT Caffe_FOUND) - return() -endif(NOT Caffe_FOUND) - add_library(nnkit_support_caffe INTERFACE) target_include_directories(nnkit_support_caffe INTERFACE include) target_link_libraries(nnkit_support_caffe INTERFACE nnkit_intf_backend) diff --git a/contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/Backend.h b/contrib/nnkit-caffe/support/include/nnkit/support/caffe/Backend.h similarity index 100% rename from contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/Backend.h rename to contrib/nnkit-caffe/support/include/nnkit/support/caffe/Backend.h diff --git a/contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/BlobContext.h b/contrib/nnkit-caffe/support/include/nnkit/support/caffe/BlobContext.h similarity index 100% rename from contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/BlobContext.h rename to contrib/nnkit-caffe/support/include/nnkit/support/caffe/BlobContext.h diff --git a/contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/InputBlobContext.h b/contrib/nnkit-caffe/support/include/nnkit/support/caffe/InputBlobContext.h similarity index 100% rename from contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/InputBlobContext.h rename to contrib/nnkit-caffe/support/include/nnkit/support/caffe/InputBlobContext.h diff --git a/contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/OutputBlobContext.h b/contrib/nnkit-caffe/support/include/nnkit/support/caffe/OutputBlobContext.h similarity index 100% rename from contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/OutputBlobContext.h rename to contrib/nnkit-caffe/support/include/nnkit/support/caffe/OutputBlobContext.h diff --git a/contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/TensorContext.h b/contrib/nnkit-caffe/support/include/nnkit/support/caffe/TensorContext.h similarity index 100% rename from contrib/nnkit/libs/support/caffe/include/nnkit/support/caffe/TensorContext.h rename to contrib/nnkit-caffe/support/include/nnkit/support/caffe/TensorContext.h diff --git a/contrib/nnkit/requires.cmake b/contrib/nnkit/requires.cmake index 5b007dd..da4336f 100644 --- a/contrib/nnkit/requires.cmake +++ b/contrib/nnkit/requires.cmake @@ -1,2 +1,3 @@ require("angkor") require("nnkit-intf") +require("nnkit-caffe") -- 2.7.4