From d84da7003b19a4fe458785474fadcd8e07c38637 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 20 Aug 2019 09:42:07 +0900 Subject: [PATCH] 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 --- runtimes/libs/nnapi/CMakeLists.txt | 3 +++ runtimes/libs/nnapi/v1.1/CMakeLists.txt | 4 ++++ runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksExShim.h | 0 runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksLoadHelpers.h | 0 runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksShim.h | 0 runtimes/libs/rua/core/CMakeLists.txt | 2 +- tests/nnapi/CMakeLists.txt | 2 +- 7 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 runtimes/libs/nnapi/CMakeLists.txt create mode 100644 runtimes/libs/nnapi/v1.1/CMakeLists.txt rename runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksExShim.h (100%) rename runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksLoadHelpers.h (100%) rename runtimes/{ => libs/nnapi/v1.1}/include/NeuralNetworksShim.h (100%) diff --git a/runtimes/libs/nnapi/CMakeLists.txt b/runtimes/libs/nnapi/CMakeLists.txt new file mode 100644 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 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 --- 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 --- 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) -- 2.7.4