Support multiple NN API bindings

This commit revises CMake script to support multiple NN API bindings.

To support multiple NN API bindings, CMake sciprt for simple logging NN API binding
is revised not to install libneuralnetworks.so into lib.

In addition, directory structres are revised.

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

diff --git a/README.md b/README.md
index 6b610a8..7277865 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,5 +7,5 @@ This repo provides a T/F Lite Model loader(named ``tflite_run``), and simple NNA
 Let's type the following commands, and see what happens!
 ```
 $ make install
-$ USE_NNAPI=1 LD_LIBRARY_PATH="$(pwd)/Product/out/lib" Product/out/bin/tflite_run [T/F Lite Flatbuffer Model Path]
+$ USE_NNAPI=1 LD_LIBRARY_PATH="$(pwd)/Product/obj/tools/nnapi_bindings/bindings/logging" Product/out/bin/tflite_run [T/F Lite Flatbuffer Model Path]
 ```

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a714df1..1abaede 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(tflite_run)
-add_subdirectory(nnapi_logging)
+add_subdirectory(nnapi_bindings)

diff --git a/tools/nnapi_bindings/CMakeLists.txt b/tools/nnapi_bindings/CMakeLists.txt
new file mode 100644 (file)
index 0000000..547d50e
--- /dev/null
+++ b/tools/nnapi_bindings/CMakeLists.txt
@@ -0,0 +1,3 @@
+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
new file mode 100644 (file)
index 0000000..504db2b
--- /dev/null
+++ b/tools/nnapi_bindings/bindings/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(logging)

diff --git a/tools/nnapi_logging/CMakeLists.txt b/tools/nnapi_bindings/bindings/logging/CMakeLists.txt
similarity index 60%
rename from tools/nnapi_logging/CMakeLists.txt
rename to tools/nnapi_bindings/bindings/logging/CMakeLists.txt
index 9328656..2df3e90 100644 (file)
--- a/tools/nnapi_logging/CMakeLists.txt
+++ b/tools/nnapi_bindings/bindings/logging/CMakeLists.txt
@@ -1,7 +1,5 @@
 file(GLOB_RECURSE NNAPI_LOGGING_SRCS "src/*.cc")
 
 add_library(neuralnetworks SHARED ${NNAPI_LOGGING_SRCS})
-target_include_directories(neuralnetworks PUBLIC ${CMAKE_SOURCE_DIR}/include)
+target_include_directories(neuralnetworks PUBLIC ${NNAPI_INCLUDE_DIR})
 target_include_directories(neuralnetworks PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-install(TARGETS neuralnetworks DESTINATION lib)

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

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

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