From 0d110594b8a50ce3311be5187f01de2e3b8fe995 Mon Sep 17 00:00:00 2001 From: Richard Burton Date: Thu, 12 Aug 2021 17:26:30 +0100 Subject: MLECO-1904: Update to use latest TFLu * Now uses seperate TFLu github repo * Fixes to align with API changes * Update ASR model ops and re-enable ASR inference tests * Set default release level to release_with_logs Signed-off-by: Richard Burton Change-Id: I57612088985dece1413c5c00a6e442381e07dd91 --- scripts/cmake/tensorflow.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/tensorflow.cmake b/scripts/cmake/tensorflow.cmake index d0654b8..c2906f5 100644 --- a/scripts/cmake/tensorflow.cmake +++ b/scripts/cmake/tensorflow.cmake @@ -20,14 +20,12 @@ ProcessorCount(J) if (CMAKE_BUILD_TYPE STREQUAL Debug) set(TENSORFLOW_LITE_MICRO_DEFAULT_BUILD_TYPE "debug") - set(TENSORFLOW_LITE_MICRO_OPTIMIZATION_LEVEL "-O0") + set(TENSORFLOW_LITE_MICRO_CORE_OPTIMIZATION_LEVEL "-O0") + set(TENSORFLOW_LITE_MICRO_KERNEL_OPTIMIZATION_LEVEL "-O0") elseif (CMAKE_BUILD_TYPE STREQUAL Release) - set(TENSORFLOW_LITE_MICRO_DEFAULT_BUILD_TYPE "release") - set(TENSORFLOW_LITE_MICRO_OPTIMIZATION_LEVEL "-O3") -elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo) set(TENSORFLOW_LITE_MICRO_DEFAULT_BUILD_TYPE "release_with_logs") - # No override for optimsiation level; we rely on the default - # optimisation applied by TensorFlow Lite Micro build here. + set(TENSORFLOW_LITE_MICRO_CORE_OPTIMIZATION_LEVEL "-O3") + set(TENSORFLOW_LITE_MICRO_KERNEL_OPTIMIZATION_LEVEL "-O3") elseif (NOT DEFINED TENSORFLOW_LITE_MICRO_BUILD_TYPE) message(WARNING "TENSORFLOW_LITE_MICRO_BUILD_TYPE is not set.") message(FATAL_ERROR "Build type ${CMAKE_BUILD_TYPE} does not have a corresponding " @@ -109,7 +107,8 @@ add_custom_target(tensorflow_build ALL # Conditional arguments $<$:ARMCLANG_DEBUG_DWARF_LEVEL=${ARMCLANG_DEBUG_DWARF_LEVEL}> - $<$:OPTIMIZATION_LEVEL=${TENSORFLOW_LITE_MICRO_OPTIMIZATION_LEVEL}> + $<$:CORE_OPTIMIZATION_LEVEL=${TENSORFLOW_LITE_MICRO_CORE_OPTIMIZATION_LEVEL}> + $<$:KERNEL_OPTIMIZATION_LEVEL=${TENSORFLOW_LITE_MICRO_KERNEL_OPTIMIZATION_LEVEL}> $<$:OPTIMIZED_KERNEL_DIR=${TENSORFLOW_LITE_MICRO_OPTIMIZED_KERNEL}> $<$:CO_PROCESSOR=${TENSORFLOW_LITE_MICRO_CO_PROCESSOR}> -- cgit v1.2.1