From dc8039a6fe2aa90507d643b265d2ab3f7ce16e06 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: Wed, 26 Jun 2019 10:38:27 +0900 Subject: [PATCH] Extract nnkit-tf from nnkit (#3974) This commit extracts nnkit-tf from nnkit to make it easy to manage internal dependencies. Signed-off-by: Jonghyun Park --- contrib/nnkit-tf/CMakeLists.txt | 8 ++++++++ contrib/{nnkit/backends/tf => nnkit-tf/backend}/Backend.cpp | 0 contrib/{nnkit/backends/tf => nnkit-tf/backend}/CMakeLists.txt | 4 ---- contrib/nnkit-tf/requires.cmake | 3 +++ .../{nnkit/libs/support/tf => nnkit-tf/support}/CMakeLists.txt | 6 ------ .../tf => nnkit-tf/support}/include/nnkit/support/tf/Backend.h | 0 .../tf => nnkit-tf/support}/include/nnkit/support/tf/Runner.h | 0 .../support}/include/nnkit/support/tf/TensorContext.h | 0 .../support}/include/nnkit/support/tf/TensorDataMap.h | 0 .../{nnkit/libs/support/tf => nnkit-tf/support}/src/Backend.cpp | 0 .../{nnkit/libs/support/tf => nnkit-tf/support}/src/Runner.cpp | 0 .../libs/support/tf => nnkit-tf/support}/src/TensorContext.cpp | 0 contrib/nnkit/requires.cmake | 1 + 13 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 contrib/nnkit-tf/CMakeLists.txt rename contrib/{nnkit/backends/tf => nnkit-tf/backend}/Backend.cpp (100%) rename contrib/{nnkit/backends/tf => nnkit-tf/backend}/CMakeLists.txt (65%) create mode 100644 contrib/nnkit-tf/requires.cmake rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/CMakeLists.txt (81%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/include/nnkit/support/tf/Backend.h (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/include/nnkit/support/tf/Runner.h (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/include/nnkit/support/tf/TensorContext.h (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/include/nnkit/support/tf/TensorDataMap.h (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/src/Backend.cpp (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/src/Runner.cpp (100%) rename contrib/{nnkit/libs/support/tf => nnkit-tf/support}/src/TensorContext.cpp (100%) diff --git a/contrib/nnkit-tf/CMakeLists.txt b/contrib/nnkit-tf/CMakeLists.txt new file mode 100644 index 0000000..401746f --- /dev/null +++ b/contrib/nnkit-tf/CMakeLists.txt @@ -0,0 +1,8 @@ +nncc_find_package(TensorFlow QUIET) + +if(NOT TensorFlow_FOUND) + return() +endif(NOT TensorFlow_FOUND) + +add_subdirectory(support) +add_subdirectory(backend) diff --git a/contrib/nnkit/backends/tf/Backend.cpp b/contrib/nnkit-tf/backend/Backend.cpp similarity index 100% rename from contrib/nnkit/backends/tf/Backend.cpp rename to contrib/nnkit-tf/backend/Backend.cpp diff --git a/contrib/nnkit/backends/tf/CMakeLists.txt b/contrib/nnkit-tf/backend/CMakeLists.txt similarity index 65% rename from contrib/nnkit/backends/tf/CMakeLists.txt rename to contrib/nnkit-tf/backend/CMakeLists.txt index 1246d79..dd2e469 100644 --- a/contrib/nnkit/backends/tf/CMakeLists.txt +++ b/contrib/nnkit-tf/backend/CMakeLists.txt @@ -1,7 +1,3 @@ -if(NOT TARGET nnkit_support_tf) - return() -endif(NOT TARGET nnkit_support_tf) - add_library(nnkit_tf_backend SHARED Backend.cpp) target_link_libraries(nnkit_tf_backend nnkit_support_tf) target_link_libraries(nnkit_tf_backend stdex) diff --git a/contrib/nnkit-tf/requires.cmake b/contrib/nnkit-tf/requires.cmake new file mode 100644 index 0000000..4b9fd68 --- /dev/null +++ b/contrib/nnkit-tf/requires.cmake @@ -0,0 +1,3 @@ +require("stdex") +require("tfinfo") +require("nnkit-intf") diff --git a/contrib/nnkit/libs/support/tf/CMakeLists.txt b/contrib/nnkit-tf/support/CMakeLists.txt similarity index 81% rename from contrib/nnkit/libs/support/tf/CMakeLists.txt rename to contrib/nnkit-tf/support/CMakeLists.txt index bffa22d..471a1c7 100644 --- a/contrib/nnkit/libs/support/tf/CMakeLists.txt +++ b/contrib/nnkit-tf/support/CMakeLists.txt @@ -1,9 +1,3 @@ -nncc_find_package(TensorFlow QUIET) - -if(NOT TensorFlow_FOUND) - return() -endif(NOT TensorFlow_FOUND) - file(GLOB_RECURSE SOURCES "src/*.cpp") add_library(nnkit_support_tf-1.12 STATIC ${SOURCES}) diff --git a/contrib/nnkit/libs/support/tf/include/nnkit/support/tf/Backend.h b/contrib/nnkit-tf/support/include/nnkit/support/tf/Backend.h similarity index 100% rename from contrib/nnkit/libs/support/tf/include/nnkit/support/tf/Backend.h rename to contrib/nnkit-tf/support/include/nnkit/support/tf/Backend.h diff --git a/contrib/nnkit/libs/support/tf/include/nnkit/support/tf/Runner.h b/contrib/nnkit-tf/support/include/nnkit/support/tf/Runner.h similarity index 100% rename from contrib/nnkit/libs/support/tf/include/nnkit/support/tf/Runner.h rename to contrib/nnkit-tf/support/include/nnkit/support/tf/Runner.h diff --git a/contrib/nnkit/libs/support/tf/include/nnkit/support/tf/TensorContext.h b/contrib/nnkit-tf/support/include/nnkit/support/tf/TensorContext.h similarity index 100% rename from contrib/nnkit/libs/support/tf/include/nnkit/support/tf/TensorContext.h rename to contrib/nnkit-tf/support/include/nnkit/support/tf/TensorContext.h diff --git a/contrib/nnkit/libs/support/tf/include/nnkit/support/tf/TensorDataMap.h b/contrib/nnkit-tf/support/include/nnkit/support/tf/TensorDataMap.h similarity index 100% rename from contrib/nnkit/libs/support/tf/include/nnkit/support/tf/TensorDataMap.h rename to contrib/nnkit-tf/support/include/nnkit/support/tf/TensorDataMap.h diff --git a/contrib/nnkit/libs/support/tf/src/Backend.cpp b/contrib/nnkit-tf/support/src/Backend.cpp similarity index 100% rename from contrib/nnkit/libs/support/tf/src/Backend.cpp rename to contrib/nnkit-tf/support/src/Backend.cpp diff --git a/contrib/nnkit/libs/support/tf/src/Runner.cpp b/contrib/nnkit-tf/support/src/Runner.cpp similarity index 100% rename from contrib/nnkit/libs/support/tf/src/Runner.cpp rename to contrib/nnkit-tf/support/src/Runner.cpp diff --git a/contrib/nnkit/libs/support/tf/src/TensorContext.cpp b/contrib/nnkit-tf/support/src/TensorContext.cpp similarity index 100% rename from contrib/nnkit/libs/support/tf/src/TensorContext.cpp rename to contrib/nnkit-tf/support/src/TensorContext.cpp diff --git a/contrib/nnkit/requires.cmake b/contrib/nnkit/requires.cmake index 32497ac..3db3554 100644 --- a/contrib/nnkit/requires.cmake +++ b/contrib/nnkit/requires.cmake @@ -4,4 +4,5 @@ require("tfinfo") require("nnkit-intf") require("nnkit-caffe") require("nnkit-tflite") +require("nnkit-tf") require("nnkit-mocotf") -- 2.7.4