From 5d03e31aaf4d82e9f9cdc03c41d2328bbb2a0dee Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Tue, 17 Nov 2020 16:43:56 +0000 Subject: IVGCVSW-5377 Add ArmNN TfLite delegate to ExecuteNetwork * Added package manger to turn internal calls to find_package into a no-op * Changed delegate cmake so it can now be built within armnn Change-Id: I2a7ecb9a3c1ca05474cd1dccd91498f6f6c0b32e Signed-off-by: Finn Williams Signed-off-by: Sadik Armagan --- CMakeLists.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 30b03dce04..cee3c2a020 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,16 @@ foreach(cmake_file ${additional_cmake_files}) include(${cmake_file}) endforeach() +cmake_policy(SET CMP0057 NEW) + +set(as_subproject Armnn) + +macro(find_package) + if(NOT ${ARGV0} IN_LIST as_subproject) + _find_package(${ARGV}) + endif() +endmacro() + if (DYNAMIC_BACKEND_PATHS) # It's expected to have the format: DYNAMIC_BACKEND_PATHS="PATH_1:PATH_2...:PATH_N" add_definitions('-DDYNAMIC_BACKEND_PATHS="${DYNAMIC_BACKEND_PATHS}"') @@ -29,6 +39,15 @@ add_subdirectory(src/armnnTfLiteParser) add_subdirectory(src/armnnSerializer) add_subdirectory(src/armnnDeserializer) + +if (BUILD_ARMNN_TFLITE_DELEGATE) + + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/delegate/cmake/Modules) + add_subdirectory(delegate) + + add_definitions(-DARMNN_TF_LITE_DELEGATE) +endif() + if (BUILD_TESTS) add_subdirectory(tests) endif() @@ -1164,6 +1183,9 @@ export( NAMESPACE Armnn:: ) +add_library(Armnn::Armnn ALIAS armnn) +add_library(Armnn::armnnUtils ALIAS armnnUtils) + #################################################### ## Build Python bindings if (BUILD_PYTHON_WHL OR BUILD_PYTHON_SRC) -- cgit v1.2.1