From fca233eed08f4ec3b793fe76abae540e391f8319 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Thu, 23 Sep 2021 12:16:53 +0100 Subject: IVGCVSW-6181 patch to allow building against tflite > v2.3 Change-Id: I292add699b2af32fab87b98929fe6fee79fdf356 Signed-off-by: Jim Flynn --- delegate/CMakeLists.txt | 7 +++++++ delegate/cmake/Modules/FindTfLite.cmake | 20 ++++++++++---------- delegate/cmake/Modules/FindTfLiteSrc.cmake | 28 ++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 delegate/cmake/Modules/FindTfLiteSrc.cmake (limited to 'delegate') diff --git a/delegate/CMakeLists.txt b/delegate/CMakeLists.txt index aed77bf47e..9e4fdd9de3 100644 --- a/delegate/CMakeLists.txt +++ b/delegate/CMakeLists.txt @@ -68,6 +68,7 @@ endif() target_link_libraries(armnnDelegate PUBLIC Armnn::Armnn) ## Add TfLite v2.3.1 dependency +find_package(TfLiteSrc REQUIRED MODULE) find_package(TfLite REQUIRED MODULE) target_link_libraries(armnnDelegate PUBLIC ${TfLite_LIB}) @@ -115,6 +116,11 @@ target_include_directories(thirdparty_headers INTERFACE $ + $) + + set_target_properties(armnnDelegate PROPERTIES VERSION ${DELEGATE_LIB_VERSION} SOVERSION ${DELEGATE_LIB_SOVERSION}) option(BUILD_UNIT_TESTS "Build unit tests" ON) @@ -232,6 +238,7 @@ if(BUILD_UNIT_TESTS) target_link_libraries(DelegateUnitTests PRIVATE tflite_headers) target_link_libraries(DelegateUnitTests PRIVATE flatbuffer_headers) + target_link_libraries(DelegateUnitTests PRIVATE profiling_library_headers) endif() diff --git a/delegate/cmake/Modules/FindTfLite.cmake b/delegate/cmake/Modules/FindTfLite.cmake index 7940e9cad7..907c3847cb 100644 --- a/delegate/cmake/Modules/FindTfLite.cmake +++ b/delegate/cmake/Modules/FindTfLite.cmake @@ -6,15 +6,19 @@ include(FindPackageHandleStandardArgs) unset(TFLITE_FOUND) +# +# NOTE: this module is used to find the tensorflow lite binary libraries only +# the FindTfLiteSrc.cmake module is used to find the tensorflow lite include directory. +# This is to allow components like the Tensorflow lite parser that have a source dependency +# on tensorflow lite headers but no need to link to the binary libraries to use only the sources +# and not have an artificial dependency on the libraries. +# + # First look for the static version of tensorflow lite find_library(TfLite_LIB NAMES "libtensorflow-lite.a" HINTS ${TFLITE_LIB_ROOT} ${TFLITE_LIB_ROOT}/tensorflow/lite) # If not found then, look for the dynamic library of tensorflow lite find_library(TfLite_LIB NAMES "libtensorflow_lite_all.so" "libtensorflowlite.so" HINTS ${TFLITE_LIB_ROOT} ${TFLITE_LIB_ROOT}/tensorflow/lite) -# Set relevant paths -find_path(TfLite_INCLUDE_DIR NAMES tensorflow/lite third_party HINTS ${TENSORFLOW_ROOT}) -find_path(TfLite_Schema_INCLUDE_PATH schema_generated.h HINTS ${TENSORFLOW_ROOT}/tensorflow/lite/schema) - # If the static library was found, gather all of its dependencies if (TfLite_LIB MATCHES .a$) message("-- Static tensorflow lite library found, using for ArmNN build") @@ -32,21 +36,17 @@ if (TfLite_LIB MATCHES .a$) PATH ${TFLITE_LIB_ROOT}/_deps/flatbuffers-build) ## Set TFLITE_FOUND if all libraries are satisfied for static lib - find_package_handle_standard_args(TfLite DEFAULT_MSG TfLite_INCLUDE_DIR TfLite_LIB TfLite_abseilstrings_LIB TfLite_ruy_LIB TfLite_fftsg_LIB TfLite_fftsg2d_LIB TfLite_farmhash_LIB TfLite_flatbuffers_LIB TfLite_Schema_INCLUDE_PATH) + find_package_handle_standard_args(TfLite DEFAULT_MSG TfLite_LIB TfLite_abseilstrings_LIB TfLite_ruy_LIB TfLite_fftsg_LIB TfLite_fftsg2d_LIB TfLite_farmhash_LIB TfLite_flatbuffers_LIB) # Set external variables for usage in CMakeLists.txt if (TFLITE_FOUND) set(TfLite_LIB ${TfLite_LIB} ${TfLite_abseilstrings_LIB} ${TfLite_ruy_LIB} ${TfLite_fftsg_LIB} ${TfLite_fftsg2d_LIB} ${TfLite_farmhash_LIB} ${TfLite_flatbuffers_LIB}) - set(TfLite_INCLUDE_DIR ${TfLite_INCLUDE_DIR}) - set(TfLite_Schema_INCLUDE_PATH ${TfLite_Schema_INCLUDE_PATH}) endif () elseif (TfLite_LIB MATCHES .so$) message("-- Dynamic tensorflow lite library found, using for ArmNN build") - find_package_handle_standard_args(TfLite DEFAULT_MSG TfLite_INCLUDE_DIR TfLite_LIB TfLite_Schema_INCLUDE_PATH) + find_package_handle_standard_args(TfLite DEFAULT_MSG TfLite_LIB) ## Set external variables for usage in CMakeLists.txt if (TFLITE_FOUND) set(TfLite_LIB ${TfLite_LIB}) - set(TfLite_INCLUDE_DIR ${TfLite_INCLUDE_DIR}) - set(TfLite_Schema_INCLUDE_PATH ${TfLite_Schema_INCLUDE_PATH}) endif () else() message(FATAL_ERROR "Could not find a tensorflow lite library to use") diff --git a/delegate/cmake/Modules/FindTfLiteSrc.cmake b/delegate/cmake/Modules/FindTfLiteSrc.cmake new file mode 100644 index 0000000000..91833c18e6 --- /dev/null +++ b/delegate/cmake/Modules/FindTfLiteSrc.cmake @@ -0,0 +1,28 @@ +# +# Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +# SPDX-License-Identifier: MIT +# + +include(FindPackageHandleStandardArgs) +unset(TFLITE_SRC_FOUND) + +find_path(TfLite_INCLUDE_DIR + NAMES + tensorflow/lite + third_party + HINTS + ${TENSORFLOW_ROOT}) + +find_path(TfLite_Schema_INCLUDE_PATH + schema_generated.h + HINTS + ${TENSORFLOW_ROOT}/tensorflow/lite/schema) + +## Set TFLITE_FOUND +find_package_handle_standard_args(TfLiteSrc DEFAULT_MSG TfLite_INCLUDE_DIR TfLite_Schema_INCLUDE_PATH) + +## Set external variables for usage in CMakeLists.txt +if(TFLITE_SRC_FOUND) + set(TfLite_INCLUDE_DIR ${TfLite_INCLUDE_DIR}) + set(TfLite_Schema_INCLUDE_PATH ${TfLite_Schema_INCLUDE_PATH}) +endif() -- cgit v1.2.1