Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[onert/lib] Move NNAPI header files #13933

Merged
merged 1 commit into from
Sep 5, 2024
Merged

[onert/lib] Move NNAPI header files #13933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ahub/sam/exclude.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ runtime/libs/circle-schema/include/circle_traininfo_generated.h
runtime/onert/core/src/loader/tflite_schema_generated.h

# External code: Android NN API
runtime/nnapi-header/include/NeuralNetworks.h
runtime/nnapi-header/include/NeuralNetworksExtensions.h
runtime/onert/api/nnapi/include/NeuralNetworks.h
runtime/onert/api/nnapi/include/NeuralNetworksExtensions.h

# External code: Tensorflow lite
runtime/libs/profiling/
Expand Down
8 changes: 0 additions & 8 deletions runtime/nnapi-header/CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion runtime/onert/api/nnapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ list(REMOVE_ITEM SOURCES_FRONTEND ${TESTS_FRONTEND})
set(LIB_ONERT onert)

add_library(${LIB_ONERT} SHARED ${SOURCES_FRONTEND})
target_link_libraries(${LIB_ONERT} PUBLIC nnfw-nnapi-header)
target_include_directories(${LIB_ONERT} PUBLIC include)
target_link_libraries(${LIB_ONERT} PUBLIC onert_core) # TODO Link PRIVATE onert_core
target_link_libraries(${LIB_ONERT} PRIVATE nnfw_common)
target_link_libraries(${LIB_ONERT} PRIVATE nnfw_coverage)
Expand Down
0 ...ime/nnapi-header/include/NeuralNetworks.h → .../onert/api/nnapi/include/NeuralNetworks.h
View file
Open in desktop
File renamed without changes.
0 ...e/nnapi-header/include/NeuralNetworksEx.h → ...nert/api/nnapi/include/NeuralNetworksEx.h
View file
Open in desktop
File renamed without changes.
0 ...header/include/NeuralNetworksExtensions.h → .../nnapi/include/NeuralNetworksExtensions.h
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion runtime/onert/api/nnfw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ add_library(${ONERT_DEV} SHARED ${API_SRC})
# But runtime developer can use nnfw_internal.h by linking nnfw-dev
set(NNFW_API_HEADERS include/nnfw.h include/nnfw_experimental.h)

target_link_libraries(${ONERT_DEV} PUBLIC nnfw-nnapi-header)
target_link_libraries(${ONERT_DEV} PRIVATE onert_core)
target_link_libraries(${ONERT_DEV} PRIVATE nnfw_lib_misc)
target_link_libraries(${ONERT_DEV} PRIVATE jsoncpp ${LIB_PTHREAD})
Expand Down
4 changes: 2 additions & 2 deletions tests/custom_op/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function(add_nnfw_custom_op_app NAME)
list(APPEND LIBNAMELIST "${KERNEL}${SUFFIX}")
endforeach()
target_link_libraries(${NAME} PRIVATE ${LIBNAMELIST})
target_link_libraries(${NAME} PRIVATE nnfw-nnapi-header nnfw-dev)
target_link_libraries(${NAME} PRIVATE nnfw-dev)
target_link_libraries(${NAME} PRIVATE dl ${LIB_PTHREAD})
endfunction()

Expand All @@ -57,7 +57,7 @@ function(add_nnfw_custom_op_kernel NAME STATIC)
# message(FATAL_ERROR SHARED)
add_library(${LIBNAME} SHARED ${ARGN})
endif()
target_link_libraries(${LIBNAME} PRIVATE nnfw-nnapi-header nnfw-dev)
target_link_libraries(${LIBNAME} PRIVATE nnfw-dev)
target_link_libraries(${LIBNAME} PRIVATE flatbuffers::flatbuffers-23.5.26)
endfunction()

Expand Down
2 changes: 1 addition & 1 deletion tests/libs/nnapi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_library(nnfw_lib_nnapi INTERFACE)

target_include_directories(nnfw_lib_nnapi INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(nnfw_lib_nnapi INTERFACE nnfw-nnapi-header)
target_link_libraries(nnfw_lib_nnapi INTERFACE onert)