Replace nnapi shim headers into libs (#6588)

Introduce libs/nnapi
Replace NeuralNetworksShims.h, NeuralNetworksExShims.h NeuralNetworksLoadHelpers.h to libs/nnapi

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/runtimes/libs/nnapi/CMakeLists.txt b/runtimes/libs/nnapi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..50d7962
--- /dev/null
+++ b/runtimes/libs/nnapi/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectories()
+
+add_library(nnfw_lib_nnapi ALIAS nnfw_lib_nnapi_1_1)

diff --git a/runtimes/libs/nnapi/v1.1/CMakeLists.txt b/runtimes/libs/nnapi/v1.1/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1bc158f
--- /dev/null
+++ b/runtimes/libs/nnapi/v1.1/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(nnfw_lib_nnapi_1_1 INTERFACE)
+
+target_include_directories(nnfw_lib_nnapi_1_1 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_link_libraries(nnfw_lib_nnapi_1_1 INTERFACE nnfw-header)

diff --git a/runtimes/include/NeuralNetworksExShim.h b/runtimes/libs/nnapi/v1.1/include/NeuralNetworksExShim.h
similarity index 100%
rename from runtimes/include/NeuralNetworksExShim.h
rename to runtimes/libs/nnapi/v1.1/include/NeuralNetworksExShim.h

diff --git a/runtimes/include/NeuralNetworksLoadHelpers.h b/runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h
similarity index 100%
rename from runtimes/include/NeuralNetworksLoadHelpers.h
rename to runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h

diff --git a/runtimes/include/NeuralNetworksShim.h b/runtimes/libs/nnapi/v1.1/include/NeuralNetworksShim.h
similarity index 100%
rename from runtimes/include/NeuralNetworksShim.h
rename to runtimes/libs/nnapi/v1.1/include/NeuralNetworksShim.h

diff --git a/runtimes/libs/rua/core/CMakeLists.txt b/runtimes/libs/rua/core/CMakeLists.txt
index 2b6a8a5..f7d41f6 100644 (file)
--- a/runtimes/libs/rua/core/CMakeLists.txt
+++ b/runtimes/libs/rua/core/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_library(nnfw_lib_rua_core INTERFACE)
 target_include_directories(nnfw_lib_rua_core INTERFACE include)
-target_link_libraries(nnfw_lib_rua_core INTERFACE nnfw-header)
+target_link_libraries(nnfw_lib_rua_core INTERFACE nnfw_lib_nnapi)

diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt
index 279db34..dc8ba86 100644 (file)
--- a/tests/nnapi/CMakeLists.txt
+++ b/tests/nnapi/CMakeLists.txt
@@ -45,7 +45,7 @@ if (BUILD_NEURUN)
 elseif (BUILD_PURE_ARM_COMPUTE)
   set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}.pacl)
 endif()
-target_link_libraries(${RUNTIME_NNAPI_TEST} nnfw-header)
+target_link_libraries(${RUNTIME_NNAPI_TEST} nnfw_lib_nnapi)
 target_link_libraries(${RUNTIME_NNAPI_TEST} gtest)
 target_link_libraries(${RUNTIME_NNAPI_TEST} ${LIB_PTHREAD} dl)