From 2916e351c7e260a1c8c5856a86464834aad90310 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: Mon, 5 Aug 2019 17:50:01 +0900 Subject: [PATCH] Rename nnapi-header (#6199) Rename nnapi-header interface to nnfw-header Signed-off-by: Hyeongseok Oh --- infra/nnfw/CMakeLists.txt | 4 ++-- runtimes/libs/rua/core/CMakeLists.txt | 2 +- runtimes/logging/CMakeLists.txt | 2 +- runtimes/neurun/frontend/api/CMakeLists.txt | 2 +- runtimes/neurun/frontend/nnapi/CMakeLists.txt | 2 +- runtimes/pure_arm_compute/CMakeLists.txt | 2 +- tests/nnapi/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/infra/nnfw/CMakeLists.txt b/infra/nnfw/CMakeLists.txt index 868381a..4090983 100644 --- a/infra/nnfw/CMakeLists.txt +++ b/infra/nnfw/CMakeLists.txt @@ -84,8 +84,8 @@ nnfw_include(ExtendCMakeFunction) set(NNFW_SOURCE_ROOT "${CMAKE_SOURCE_DIR}/../..") -add_library(nnapi-header INTERFACE) -target_include_directories(nnapi-header INTERFACE ${NNFW_SOURCE_ROOT}/runtimes/include) +add_library(nnfw-header INTERFACE) +target_include_directories(nnfw-header INTERFACE ${NNFW_SOURCE_ROOT}/runtimes/include) # TODO Support android build via fine-control for each component # - Introduce BUILD_CONTRIB option diff --git a/runtimes/libs/rua/core/CMakeLists.txt b/runtimes/libs/rua/core/CMakeLists.txt index 4ea4eea..2b6a8a5 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 nnapi-header) +target_link_libraries(nnfw_lib_rua_core INTERFACE nnfw-header) diff --git a/runtimes/logging/CMakeLists.txt b/runtimes/logging/CMakeLists.txt index 4f79aa3..956890b 100644 --- a/runtimes/logging/CMakeLists.txt +++ b/runtimes/logging/CMakeLists.txt @@ -5,4 +5,4 @@ nnfw_find_package(Boost REQUIRED) add_library(neuralnetworks SHARED ${NNAPI_LOGGING_SRCS}) target_include_directories(neuralnetworks PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(neuralnetworks PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(neuralnetworks PUBLIC nnapi-header) +target_link_libraries(neuralnetworks PUBLIC nnfw-header) diff --git a/runtimes/neurun/frontend/api/CMakeLists.txt b/runtimes/neurun/frontend/api/CMakeLists.txt index 95fe661..2c1579d 100644 --- a/runtimes/neurun/frontend/api/CMakeLists.txt +++ b/runtimes/neurun/frontend/api/CMakeLists.txt @@ -3,7 +3,7 @@ file(GLOB_RECURSE API_SRC "*.cc") set(NEURUN_DEV nnfw-dev) add_library(${NEURUN_DEV} SHARED ${API_SRC}) -target_link_libraries(${NEURUN_DEV} nnapi-header) +target_link_libraries(${NEURUN_DEV} nnfw-header) target_link_libraries(${NEURUN_DEV} ${LIB_NEURUN}) target_link_libraries(${NEURUN_DEV} jsoncpp tflite_loader pthread) install(TARGETS ${NEURUN_DEV} DESTINATION lib) diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt index 5c4dbfb..fa8aaa3 100644 --- a/runtimes/neurun/frontend/nnapi/CMakeLists.txt +++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt @@ -1,7 +1,7 @@ file(GLOB_RECURSE SOURCES_FRONTEND "*.cc") add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND}) -target_link_libraries(${LIB_NEURUN} nnapi-header) +target_link_libraries(${LIB_NEURUN} nnfw-header) target_link_libraries(${LIB_NEURUN} neurun-core) target_compile_options(${LIB_NEURUN} PRIVATE -Wall -Wextra -Werror) diff --git a/runtimes/pure_arm_compute/CMakeLists.txt b/runtimes/pure_arm_compute/CMakeLists.txt index b45db66..32a0ca7 100644 --- a/runtimes/pure_arm_compute/CMakeLists.txt +++ b/runtimes/pure_arm_compute/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(nnapi_pure_arm_compute PUBLIC src) if(BUILD_TFLITE_BENCHMARK_MODEL) target_compile_definitions(nnapi_pure_arm_compute PUBLIC "TFLITE_PROFILING_ENABLED") endif() -target_link_libraries(nnapi_pure_arm_compute nnapi-header) +target_link_libraries(nnapi_pure_arm_compute nnfw-header) target_link_libraries(nnapi_pure_arm_compute arm_compute arm_compute_ex) target_link_libraries(nnapi_pure_arm_compute nnfw_lib_cpp14 nnfw_lib_misc nnfw_lib_profiling) diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt index 9ad4518..279db34 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} nnapi-header) +target_link_libraries(${RUNTIME_NNAPI_TEST} nnfw-header) target_link_libraries(${RUNTIME_NNAPI_TEST} gtest) target_link_libraries(${RUNTIME_NNAPI_TEST} ${LIB_PTHREAD} dl) -- 2.7.4