From: 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 Date: Thu, 11 Apr 2019 03:22:56 +0000 (+0900) Subject: Remove cpu backend build dependency with tflite (#4975) X-Git-Tag: accepted/tizen/unified/20190430.113441~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4ad757c394e9e558ff9f6d2c7b5145cfe2c95de;p=platform%2Fcore%2Fml%2Fnnfw.git Remove cpu backend build dependency with tflite (#4975) Remove header path and linking dependency with tflite in cpu backend build cmake Signed-off-by: Hyeongseok Oh --- diff --git a/runtimes/neurun/backend/cpu/CMakeLists.txt b/runtimes/neurun/backend/cpu/CMakeLists.txt index 37fbfd8..fac5abe 100644 --- a/runtimes/neurun/backend/cpu/CMakeLists.txt +++ b/runtimes/neurun/backend/cpu/CMakeLists.txt @@ -1,10 +1,3 @@ -# Need internal header code to build cpu backend -nnfw_find_package(TensorFlowSource QUIET) -nnfw_find_package(TensorFlowLite QUIET) -if((NOT TensorFlowSource_FOUND) OR (NOT TensorFlowLite_FOUND)) - return() -endif() - add_subdirectory(kernel) file(GLOB_RECURSE SOURCES "*.cc") @@ -15,10 +8,7 @@ list(REMOVE_ITEM SOURCES ${TESTS}) add_library(${LIB_NEURUN_BACKEND_CPU} SHARED ${SOURCES}) -target_include_directories(${LIB_NEURUN_BACKEND_CPU} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow) - target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnapi-header) -target_link_libraries(${LIB_NEURUN_BACKEND_CPU} tensorflow-lite) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_lib_misc) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_lib_cpp14) target_link_libraries(${LIB_NEURUN_BACKEND_CPU} ${LIB_NEURUN_KERNEL_CPU}) diff --git a/runtimes/neurun/backend/cpu/kernel/CMakeLists.txt b/runtimes/neurun/backend/cpu/kernel/CMakeLists.txt index 1f35ce9..d2b3b54 100644 --- a/runtimes/neurun/backend/cpu/kernel/CMakeLists.txt +++ b/runtimes/neurun/backend/cpu/kernel/CMakeLists.txt @@ -3,10 +3,8 @@ file(GLOB SOURCES "*.cc") add_library(${LIB_NEURUN_KERNEL_CPU} STATIC ${SOURCES}) target_include_directories(${LIB_NEURUN_KERNEL_CPU} PUBLIC ${NEURUN_INCLUDE_DIR}) -target_include_directories(${LIB_NEURUN_KERNEL_CPU} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow) target_link_libraries(${LIB_NEURUN_KERNEL_CPU} nnapi-header) -target_link_libraries(${LIB_NEURUN_KERNEL_CPU} tensorflow-lite) target_link_libraries(${LIB_NEURUN_KERNEL_CPU} nnfw_lib_misc nnfw_lib_cker) set_target_properties(${LIB_NEURUN_KERNEL_CPU} PROPERTIES POSITION_INDEPENDENT_CODE ON)