From: 이상규/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Tue, 1 Oct 2019 09:20:37 +0000 (+0900) Subject: [neurun] move api out of frontend (#7873) X-Git-Tag: submit/tizen/20191205.083104~980 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=706a2aeb4b06024440aae3cb699a0c5d8d0236d9;p=platform%2Fcore%2Fml%2Fnnfw.git [neurun] move api out of frontend (#7873) - api is now under `neurun`, instead of `neurun/frontend`. - add dependency for nnfw-header in custom op kernels and apps. Signed-off-by: Sanggyu Lee --- diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt index 6d3822c..c4754f8 100644 --- a/runtimes/neurun/CMakeLists.txt +++ b/runtimes/neurun/CMakeLists.txt @@ -7,4 +7,5 @@ set(NEURUN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core/include) add_subdirectory(backend) add_subdirectory(frontend) add_subdirectory(core) +add_subdirectory(api) add_subdirectory(test) diff --git a/runtimes/neurun/frontend/api/CMakeLists.txt b/runtimes/neurun/api/CMakeLists.txt similarity index 100% rename from runtimes/neurun/frontend/api/CMakeLists.txt rename to runtimes/neurun/api/CMakeLists.txt diff --git a/runtimes/neurun/frontend/api/nnfw_dev.cc b/runtimes/neurun/api/nnfw_dev.cc similarity index 100% rename from runtimes/neurun/frontend/api/nnfw_dev.cc rename to runtimes/neurun/api/nnfw_dev.cc diff --git a/runtimes/neurun/frontend/api/wrapper/nnfw_api.cc b/runtimes/neurun/api/wrapper/nnfw_api.cc similarity index 100% rename from runtimes/neurun/frontend/api/wrapper/nnfw_api.cc rename to runtimes/neurun/api/wrapper/nnfw_api.cc diff --git a/runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp b/runtimes/neurun/api/wrapper/nnfw_api.hpp similarity index 100% rename from runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp rename to runtimes/neurun/api/wrapper/nnfw_api.hpp diff --git a/tests/custom_op/apps/CMakeLists.txt b/tests/custom_op/apps/CMakeLists.txt index 18eef3f..ccaebf1 100644 --- a/tests/custom_op/apps/CMakeLists.txt +++ b/tests/custom_op/apps/CMakeLists.txt @@ -13,7 +13,7 @@ function(add_nnfw_custom_op_app NAME) ) add_executable(${NAME} ${PARSED_ARGS_SOURCES}) target_link_libraries(${NAME} PRIVATE ${PARSED_ARGS_KERNELS}) - target_link_libraries(${NAME} PRIVATE nnfw-dev) + target_link_libraries(${NAME} PRIVATE nnfw-header nnfw-dev) target_link_libraries(${NAME} PRIVATE dl ${LIB_PTHREAD}) endfunction() diff --git a/tests/custom_op/kernels/CMakeLists.txt b/tests/custom_op/kernels/CMakeLists.txt index 9b960a3..1d292f3 100644 --- a/tests/custom_op/kernels/CMakeLists.txt +++ b/tests/custom_op/kernels/CMakeLists.txt @@ -2,7 +2,7 @@ nnfw_find_package(FlatBuffers REQUIRED) function(add_nnfw_kernel NAME) add_library(${NAME} STATIC ${ARGN}) - target_link_libraries(${NAME} PRIVATE nnfw-dev) + target_link_libraries(${NAME} PRIVATE nnfw-header nnfw-dev) target_link_libraries(${NAME} PRIVATE flatbuffers) endfunction()