Extract nnkit-onnxrt from nnkit (#3989)

Let's allow each module to depend on nnkit-onnxrt.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/nnkit-onnxrt/CMakeLists.txt b/contrib/nnkit-onnxrt/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1950abb
--- /dev/null
+++ b/contrib/nnkit-onnxrt/CMakeLists.txt
@@ -0,0 +1,8 @@
+nncc_find_package(ONNXRuntime QUIET)
+
+if(NOT ONNXRuntime_FOUND)
+  return()
+endif(NOT ONNXRuntime_FOUND)
+
+add_subdirectory(support)
+add_subdirectory(backend)

diff --git a/contrib/nnkit/backends/onnx/Backend.cpp b/contrib/nnkit-onnxrt/backend/Backend.cpp
similarity index 100%
rename from contrib/nnkit/backends/onnx/Backend.cpp
rename to contrib/nnkit-onnxrt/backend/Backend.cpp

diff --git a/contrib/nnkit/backends/onnx/CMakeLists.txt b/contrib/nnkit-onnxrt/backend/CMakeLists.txt
similarity index 65%
rename from contrib/nnkit/backends/onnx/CMakeLists.txt
rename to contrib/nnkit-onnxrt/backend/CMakeLists.txt
index f953966..b00e559 100644 (file)
--- a/contrib/nnkit/backends/onnx/CMakeLists.txt
+++ b/contrib/nnkit-onnxrt/backend/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(NOT TARGET nnkit_support_onnx)
-  return()
-endif(NOT TARGET nnkit_support_onnx)
-
 add_library(nnkit_onnx_backend SHARED Backend.cpp)
 target_link_libraries(nnkit_onnx_backend nnkit_support_onnx)
 target_link_libraries(nnkit_onnx_backend stdex)

diff --git a/contrib/nnkit-onnxrt/requires.cmake b/contrib/nnkit-onnxrt/requires.cmake
new file mode 100644 (file)
index 0000000..d370fc1
--- /dev/null
+++ b/contrib/nnkit-onnxrt/requires.cmake
@@ -0,0 +1,2 @@
+require("stdex")
+require("nnkit-intf")

diff --git a/contrib/nnkit/libs/support/onnx/CMakeLists.txt b/contrib/nnkit-onnxrt/support/CMakeLists.txt
similarity index 82%
rename from contrib/nnkit/libs/support/onnx/CMakeLists.txt
rename to contrib/nnkit-onnxrt/support/CMakeLists.txt
index 9880d26..1b51d4e 100644 (file)
--- a/contrib/nnkit/libs/support/onnx/CMakeLists.txt
+++ b/contrib/nnkit-onnxrt/support/CMakeLists.txt
@@ -1,9 +1,3 @@
-nncc_find_package(ONNXRuntime QUIET)
-
-if(NOT ONNXRuntime_FOUND)
-  return()
-endif(NOT ONNXRuntime_FOUND)
-
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 
 add_library(nnkit_support_onnx-1.4 STATIC ${SOURCES})

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Allocator.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Allocator.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Allocator.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Allocator.h

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Backend.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Backend.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Backend.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Backend.h

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Runner.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Runner.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Runner.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Runner.h

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Status.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Status.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/Status.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/Status.h

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/TensorContext.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/TensorContext.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/TensorContext.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/TensorContext.h

diff --git a/contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/TensorSet.h b/contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/TensorSet.h
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/include/nnkit/support/onnx/TensorSet.h
rename to contrib/nnkit-onnxrt/support/include/nnkit/support/onnx/TensorSet.h

diff --git a/contrib/nnkit/libs/support/onnx/src/Allocator.cpp b/contrib/nnkit-onnxrt/support/src/Allocator.cpp
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/src/Allocator.cpp
rename to contrib/nnkit-onnxrt/support/src/Allocator.cpp

diff --git a/contrib/nnkit/libs/support/onnx/src/Backend.cpp b/contrib/nnkit-onnxrt/support/src/Backend.cpp
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/src/Backend.cpp
rename to contrib/nnkit-onnxrt/support/src/Backend.cpp

diff --git a/contrib/nnkit/libs/support/onnx/src/Runner.cpp b/contrib/nnkit-onnxrt/support/src/Runner.cpp
similarity index 100%
rename from contrib/nnkit/libs/support/onnx/src/Runner.cpp
rename to contrib/nnkit-onnxrt/support/src/Runner.cpp

diff --git a/contrib/nnkit/requires.cmake b/contrib/nnkit/requires.cmake
index 3db3554..fe90bfd 100644 (file)
--- a/contrib/nnkit/requires.cmake
+++ b/contrib/nnkit/requires.cmake
@@ -6,3 +6,4 @@ require("nnkit-caffe")
 require("nnkit-tflite")
 require("nnkit-tf")
 require("nnkit-mocotf")
+require("nnkit-onnxrt")