From: 이춘석/동작제어Lab(SR)/Senior Engineer/삼성전자 Date: Mon, 9 Apr 2018 07:12:06 +0000 (+0900) Subject: Rename libtensorflow_lite.a to -lite.a (#504) X-Git-Tag: 0.1~383 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19d679f812821545f6c0dfad95e3b5779d2b587a;p=platform%2Fcore%2Fml%2Fnnfw.git Rename libtensorflow_lite.a to -lite.a (#504) Makefile on tensorflow-lite repo uses -lite.a To enable obs build, need to follow orignal naming. --- diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 1cba013..5d1b33e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -79,12 +79,12 @@ list(APPEND TFLITE_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/neon_2_sse") list(APPEND TFLITE_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/farmhash/src") list(APPEND TFLITE_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/flatbuffers/include") -add_library(tensorflow_lite ${TFLITE_SRCS}) -target_include_directories(tensorflow_lite PUBLIC ${TFLITE_INCLUDES}) -target_compile_definitions(tensorflow_lite PUBLIC "GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK") -target_link_libraries(tensorflow_lite eigen3 pthread dl) +add_library(tensorflow-lite ${TFLITE_SRCS}) +target_include_directories(tensorflow-lite PUBLIC ${TFLITE_INCLUDES}) +target_compile_definitions(tensorflow-lite PUBLIC "GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK") +target_link_libraries(tensorflow-lite eigen3 pthread dl) -install(TARGETS tensorflow_lite ARCHIVE DESTINATION lib) +install(TARGETS tensorflow-lite ARCHIVE DESTINATION lib) if(BUILD_ACL) include(acl.cmake) diff --git a/src/support/tflite/CMakeLists.txt b/src/support/tflite/CMakeLists.txt index bf1b957..5844c74 100644 --- a/src/support/tflite/CMakeLists.txt +++ b/src/support/tflite/CMakeLists.txt @@ -4,7 +4,7 @@ list(REMOVE_ITEM SOURCES ${TESTS}) add_library(nnfw_support_tflite ${SOURCES}) target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include) -target_link_libraries(nnfw_support_tflite nnfw_util tensorflow_lite) +target_link_libraries(nnfw_support_tflite nnfw_util tensorflow-lite) add_executable(nnfw_support_tflite_test_TensorView src/TensorView.test.cpp) target_link_libraries(nnfw_support_tflite_test_TensorView nnfw_support_tflite) diff --git a/tools/tflite_benchmark/CMakeLists.txt b/tools/tflite_benchmark/CMakeLists.txt index 9df33ac..8b1d79d 100644 --- a/tools/tflite_benchmark/CMakeLists.txt +++ b/tools/tflite_benchmark/CMakeLists.txt @@ -1,4 +1,4 @@ list(APPEND SOURCES "src/tflite_benchmark.cc") add_executable(tflite_benchmark ${SOURCES}) -target_link_libraries(tflite_benchmark tensorflow_lite nnfw_util) +target_link_libraries(tflite_benchmark tensorflow-lite nnfw_util) diff --git a/tools/tflite_examples/CMakeLists.txt b/tools/tflite_examples/CMakeLists.txt index 2a9bab5..3452b54 100644 --- a/tools/tflite_examples/CMakeLists.txt +++ b/tools/tflite_examples/CMakeLists.txt @@ -1,2 +1,2 @@ add_executable(tflite_conv_example "src/conv.cpp") -target_link_libraries(tflite_conv_example tensorflow_lite) +target_link_libraries(tflite_conv_example tensorflow-lite) diff --git a/tools/tflite_run/CMakeLists.txt b/tools/tflite_run/CMakeLists.txt index 4bbad96..ca739d3 100644 --- a/tools/tflite_run/CMakeLists.txt +++ b/tools/tflite_run/CMakeLists.txt @@ -5,7 +5,7 @@ list(APPEND TFLITE_RUN_SRCS "src/args.cc") add_executable(tflite_run ${TFLITE_RUN_SRCS}) target_include_directories(tflite_run PRIVATE src) -target_link_libraries(tflite_run tensorflow_lite) +target_link_libraries(tflite_run tensorflow-lite) target_link_libraries(tflite_run boost_program_options boost_system boost_filesystem) install(TARGETS tflite_run DESTINATION bin)