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 <jh1302.park@samsung.com>

diff --git a/contrib/nnkit-tf/CMakeLists.txt b/contrib/nnkit-tf/CMakeLists.txt
new file mode 100644 (file)
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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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")