Move tools/nnapi_bindings/* to src/ (#947)

For #831

This commit moves tools/nnapi_bindings/* to src/.  The header `nnapi.h`
in tools/nnapi_bindings/include is also moved to the top-level include
directory.

Signed-off-by: Sangmin Seo <sangmin7.seo@samsung.com>

diff --git a/tools/nnapi_bindings/include/nnapi.h b/include/nnapi.h
similarity index 100%
rename from tools/nnapi_bindings/include/nnapi.h
rename to include/nnapi.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20c2e63..efdae9c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,8 @@
 if(BUILD_NN_RUNTIME)
   add_subdirectory(runtime)
 endif(BUILD_NN_RUNTIME)
+
+set(NNAPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
+add_subdirectory(template)
+add_subdirectory(logging)
+add_subdirectory(pure_arm_compute)

diff --git a/tools/nnapi_bindings/bindings/logging/CMakeLists.txt b/src/logging/CMakeLists.txt
similarity index 100%
rename from tools/nnapi_bindings/bindings/logging/CMakeLists.txt
rename to src/logging/CMakeLists.txt

diff --git a/tools/nnapi_bindings/bindings/logging/include/operand.def b/src/logging/include/operand.def
similarity index 100%
rename from tools/nnapi_bindings/bindings/logging/include/operand.def
rename to src/logging/include/operand.def

diff --git a/tools/nnapi_bindings/bindings/logging/include/operation.def b/src/logging/include/operation.def
similarity index 100%
rename from tools/nnapi_bindings/bindings/logging/include/operation.def
rename to src/logging/include/operation.def

diff --git a/tools/nnapi_bindings/bindings/logging/src/nnapi_logging.cc b/src/logging/src/nnapi_logging.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/logging/src/nnapi_logging.cc
rename to src/logging/src/nnapi_logging.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/CMakeLists.txt b/src/pure_arm_compute/CMakeLists.txt
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/CMakeLists.txt
rename to src/pure_arm_compute/CMakeLists.txt

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/compilation.cc b/src/pure_arm_compute/src/compilation.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/compilation.cc
rename to src/pure_arm_compute/src/compilation.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/compilation.h b/src/pure_arm_compute/src/compilation.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/compilation.h
rename to src/pure_arm_compute/src/compilation.h

diff --git a/tools/nnapi_bindings/bindings/template/src/event.cc b/src/pure_arm_compute/src/event.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/event.cc
rename to src/pure_arm_compute/src/event.cc

diff --git a/tools/nnapi_bindings/bindings/template/src/event.h b/src/pure_arm_compute/src/event.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/event.h
rename to src/pure_arm_compute/src/event.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/execution.cc b/src/pure_arm_compute/src/execution.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/execution.cc
rename to src/pure_arm_compute/src/execution.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/execution.h b/src/pure_arm_compute/src/execution.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/execution.h
rename to src/pure_arm_compute/src/execution.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/Model.cc b/src/pure_arm_compute/src/internal/Model.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/Model.cc
rename to src/pure_arm_compute/src/internal/Model.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/Model.h b/src/pure_arm_compute/src/internal/Model.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/Model.h
rename to src/pure_arm_compute/src/internal/Model.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute.cc b/src/pure_arm_compute/src/internal/arm_compute.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute.cc
rename to src/pure_arm_compute/src/internal/arm_compute.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute.h b/src/pure_arm_compute/src/internal/arm_compute.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute.h
rename to src/pure_arm_compute/src/internal/arm_compute.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute/feature/View.h b/src/pure_arm_compute/src/internal/arm_compute/feature/View.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute/feature/View.h
rename to src/pure_arm_compute/src/internal/arm_compute/feature/View.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute/kernel/View.h b/src/pure_arm_compute/src/internal/arm_compute/kernel/View.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/arm_compute/kernel/View.h
rename to src/pure_arm_compute/src/internal/arm_compute/kernel/View.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/Reader.h b/src/pure_arm_compute/src/internal/nnapi/feature/Reader.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/Reader.h
rename to src/pure_arm_compute/src/internal/nnapi/feature/Reader.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/Utils.h b/src/pure_arm_compute/src/internal/nnapi/feature/Utils.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/Utils.h
rename to src/pure_arm_compute/src/internal/nnapi/feature/Utils.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/View.h b/src/pure_arm_compute/src/internal/nnapi/feature/View.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/feature/View.h
rename to src/pure_arm_compute/src/internal/nnapi/feature/View.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/kernel/Reader.h b/src/pure_arm_compute/src/internal/nnapi/kernel/Reader.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/nnapi/kernel/Reader.h
rename to src/pure_arm_compute/src/internal/nnapi/kernel/Reader.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/AvgPool2D.cc b/src/pure_arm_compute/src/internal/op/AvgPool2D.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/AvgPool2D.cc
rename to src/pure_arm_compute/src/internal/op/AvgPool2D.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/AvgPool2D.h b/src/pure_arm_compute/src/internal/op/AvgPool2D.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/AvgPool2D.h
rename to src/pure_arm_compute/src/internal/op/AvgPool2D.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Concat.cc b/src/pure_arm_compute/src/internal/op/Concat.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Concat.cc
rename to src/pure_arm_compute/src/internal/op/Concat.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Concat.h b/src/pure_arm_compute/src/internal/op/Concat.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Concat.h
rename to src/pure_arm_compute/src/internal/op/Concat.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Conv2D.cc b/src/pure_arm_compute/src/internal/op/Conv2D.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Conv2D.cc
rename to src/pure_arm_compute/src/internal/op/Conv2D.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Conv2D.h b/src/pure_arm_compute/src/internal/op/Conv2D.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Conv2D.h
rename to src/pure_arm_compute/src/internal/op/Conv2D.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/FullyConnected.cc b/src/pure_arm_compute/src/internal/op/FullyConnected.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/FullyConnected.cc
rename to src/pure_arm_compute/src/internal/op/FullyConnected.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/FullyConnected.h b/src/pure_arm_compute/src/internal/op/FullyConnected.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/FullyConnected.h
rename to src/pure_arm_compute/src/internal/op/FullyConnected.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/MaxPool2D.cc b/src/pure_arm_compute/src/internal/op/MaxPool2D.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/MaxPool2D.cc
rename to src/pure_arm_compute/src/internal/op/MaxPool2D.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/MaxPool2D.h b/src/pure_arm_compute/src/internal/op/MaxPool2D.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/MaxPool2D.h
rename to src/pure_arm_compute/src/internal/op/MaxPool2D.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Node.h b/src/pure_arm_compute/src/internal/op/Node.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Node.h
rename to src/pure_arm_compute/src/internal/op/Node.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/NodeVisitor.h b/src/pure_arm_compute/src/internal/op/NodeVisitor.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/NodeVisitor.h
rename to src/pure_arm_compute/src/internal/op/NodeVisitor.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Reshape.cc b/src/pure_arm_compute/src/internal/op/Reshape.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Reshape.cc
rename to src/pure_arm_compute/src/internal/op/Reshape.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Reshape.h b/src/pure_arm_compute/src/internal/op/Reshape.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Reshape.h
rename to src/pure_arm_compute/src/internal/op/Reshape.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Softmax.cc b/src/pure_arm_compute/src/internal/op/Softmax.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Softmax.cc
rename to src/pure_arm_compute/src/internal/op/Softmax.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Softmax.h b/src/pure_arm_compute/src/internal/op/Softmax.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/internal/op/Softmax.h
rename to src/pure_arm_compute/src/internal/op/Softmax.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/logging.h b/src/pure_arm_compute/src/logging.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/logging.h
rename to src/pure_arm_compute/src/logging.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/memory.cc b/src/pure_arm_compute/src/memory.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/memory.cc
rename to src/pure_arm_compute/src/memory.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/memory.h b/src/pure_arm_compute/src/memory.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/memory.h
rename to src/pure_arm_compute/src/memory.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/model.cc b/src/pure_arm_compute/src/model.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/model.cc
rename to src/pure_arm_compute/src/model.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/model.h b/src/pure_arm_compute/src/model.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/model.h
rename to src/pure_arm_compute/src/model.h

diff --git a/tools/nnapi_bindings/bindings/template/CMakeLists.txt b/src/template/CMakeLists.txt
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/CMakeLists.txt
rename to src/template/CMakeLists.txt

diff --git a/tools/nnapi_bindings/bindings/template/src/compilation.cc b/src/template/src/compilation.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/compilation.cc
rename to src/template/src/compilation.cc

diff --git a/tools/nnapi_bindings/bindings/template/src/compilation.h b/src/template/src/compilation.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/compilation.h
rename to src/template/src/compilation.h

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/event.cc b/src/template/src/event.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/event.cc
rename to src/template/src/event.cc

diff --git a/tools/nnapi_bindings/bindings/pure_arm_compute/src/event.h b/src/template/src/event.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/pure_arm_compute/src/event.h
rename to src/template/src/event.h

diff --git a/tools/nnapi_bindings/bindings/template/src/execution.cc b/src/template/src/execution.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/execution.cc
rename to src/template/src/execution.cc

diff --git a/tools/nnapi_bindings/bindings/template/src/execution.h b/src/template/src/execution.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/execution.h
rename to src/template/src/execution.h

diff --git a/tools/nnapi_bindings/bindings/template/src/memory.cc b/src/template/src/memory.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/memory.cc
rename to src/template/src/memory.cc

diff --git a/tools/nnapi_bindings/bindings/template/src/memory.h b/src/template/src/memory.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/memory.h
rename to src/template/src/memory.h

diff --git a/tools/nnapi_bindings/bindings/template/src/model.cc b/src/template/src/model.cc
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/model.cc
rename to src/template/src/model.cc

diff --git a/tools/nnapi_bindings/bindings/template/src/model.h b/src/template/src/model.h
similarity index 100%
rename from tools/nnapi_bindings/bindings/template/src/model.h
rename to src/template/src/model.h

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6a8ee65..adb8b99 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_subdirectory(tflite_run)
 add_subdirectory(tflite_benchmark)
 add_subdirectory(tflite_examples)
-add_subdirectory(nnapi_bindings)
 add_subdirectory(nnapi_test)
 add_subdirectory(nnapi_unittests)

diff --git a/tools/nnapi_bindings/CMakeLists.txt b/tools/nnapi_bindings/CMakeLists.txt
deleted file mode 100644 (file)
index 547d50e..0000000
--- a/tools/nnapi_bindings/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-set(NNAPI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-add_subdirectory(bindings)

diff --git a/tools/nnapi_bindings/bindings/CMakeLists.txt b/tools/nnapi_bindings/bindings/CMakeLists.txt
deleted file mode 100644 (file)
index a19e454..0000000
--- a/tools/nnapi_bindings/bindings/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(template)
-add_subdirectory(logging)
-add_subdirectory(pure_arm_compute)