diff options
| author | Måns Nilsson <mans.nilsson@arm.com> | 2021-01-18 11:11:24 +0100 |
|---|---|---|
| committer | Måns Nilsson <mans.nilsson@arm.com> | 2021-01-22 14:06:58 +0100 |
| commit | 844d57db381d9b47511d9b6d726c1a31e566287b (patch) | |
| tree | 3f054269cf31a15bbb24e68aba5d9478cf63cae9 | |
| parent | 895fda86af1daf86304499f3b74a6b930192395a (diff) | |
| download | ethos-u-core-software-844d57db381d9b47511d9b6d726c1a31e566287b.tar.gz | |
Replace TAGS in TFLu
TAGS is getting deprecated.
Instead OPTIMIZED_KERNEL_DIR and CO_PROCESSOR should be used.
Change-Id: I769df90bb394d303549fc23ad034274f4a9d1aec
| -rw-r--r-- | tensorflow.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tensorflow.cmake b/tensorflow.cmake index 998f26b..10523e9 100644 --- a/tensorflow.cmake +++ b/tensorflow.cmake @@ -27,7 +27,6 @@ else () message(FATAL_ERROR "No compiler ID is set") endif() - get_filename_component(TFLU_TARGET_TOOLCHAIN_ROOT ${CMAKE_C_COMPILER} DIRECTORY) set(TFLU_TARGET_TOOLCHAIN_ROOT "${TFLU_TARGET_TOOLCHAIN_ROOT}/") @@ -42,14 +41,12 @@ set(TFLU_OPTIMIZATION_LEVEL CACHE STRING "Tensorflow Lite Micro optimization lev if(CORE_SOFTWARE_ACCELERATOR STREQUAL NPU) set(TFLU_ETHOSU_LIBS $<TARGET_FILE:ethosu_core_driver>) # Set preference for ethos-u over cmsis-nn - list(APPEND TFLU_TAGS "cmsis-nn") - list(APPEND TFLU_TAGS "ethos-u") + set(TFLU_OPTIMIZED_KERNEL_DIR "cmsis_nn") + set(TFLU_CO_PROCESSOR "ethos_u") elseif(CORE_SOFTWARE_ACCELERATOR STREQUAL CMSIS-NN) - list(APPEND TFLU_TAGS "cmsis-nn") + set(TFLU_OPTIMIZED_KERNEL_DIR "cmsis_nn") endif() -string(JOIN TFLU_TAGS " " TFLU_TAGS) - # Command and target add_custom_target(tflu_gen ALL COMMAND make -j${J} -f ${TFLU_PATH}/tools/make/Makefile microlite @@ -58,7 +55,8 @@ add_custom_target(tflu_gen ALL GENDIR=${TFLU_GENDIR} TARGET=${TFLU_TARGET} TARGET_ARCH=${TFLU_TARGET_ARCH} - TAGS="${TFLU_TAGS}" + OPTIMIZED_KERNEL_DIR="${TFLU_OPTIMIZED_KERNEL_DIR}" + CO_PROCESSOR="${TFLU_CO_PROCESSOR}" $<$<BOOL:${FLOAT}>:FLOAT=${FLOAT}> BUILD_TYPE=${TFLU_BUILD_TYPE} $<$<BOOL:${TFLU_OPTIMIZATION_LEVEL}>:OPTIMIZATION_LEVEL=${TFLU_OPTIMIZATION_LEVEL}> |