From 71f282e8dc7284431cd6d0305370cc8e450d4463 Mon Sep 17 00:00:00 2001 From: Richard Burton Date: Thu, 1 Dec 2022 12:31:23 +0000 Subject: MLECO-3620 MLECO-3619: Update to 22.11 dependencies * CMSIS-NN is now a seperate dependency * Added inclusive language commitment * TensorFlow Lite Micro dependency is moved ahead of 22.11 to fix compilation issue Change-Id: I60e3311ff7da2ce064cbcdca054a86bdd1f620d8 --- scripts/cmake/common_user_options.cmake | 6 +++++- scripts/cmake/tensorflow.cmake | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/common_user_options.cmake b/scripts/cmake/common_user_options.cmake index 3e1206d..97e9b40 100644 --- a/scripts/cmake/common_user_options.cmake +++ b/scripts/cmake/common_user_options.cmake @@ -88,9 +88,13 @@ if (NOT TARGET_PLATFORM STREQUAL native) "${DEPENDENCY_ROOT_DIR}/cmsis" PATH) USER_OPTION(CMSIS_DSP_SRC_PATH - "Path to CMSIS-5 DSP sources" + "Path to CMSIS-5 DSP sources" "${DEPENDENCY_ROOT_DIR}/cmsis-dsp" PATH) + USER_OPTION(CMSIS_NN_SRC_PATH + "Path to CMSIS-5 NN sources" + "${DEPENDENCY_ROOT_DIR}/cmsis-nn" + PATH) # If we need NPU libraries: if (ETHOS_U_NPU_ENABLED) diff --git a/scripts/cmake/tensorflow.cmake b/scripts/cmake/tensorflow.cmake index 4b50ed0..d807416 100644 --- a/scripts/cmake/tensorflow.cmake +++ b/scripts/cmake/tensorflow.cmake @@ -1,5 +1,5 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021 - 2022 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -101,6 +101,7 @@ add_custom_target(tensorflow_build ALL TARGET_ARCH=${TENSORFLOW_LITE_MICRO_TARGET_ARCH} BUILD_TYPE=${TENSORFLOW_LITE_MICRO_BUILD_TYPE} CMSIS_PATH=${CMSIS_SRC_PATH} + CMSIS_NN_PATH=${CMSIS_NN_SRC_PATH} # Conditional arguments $<$:ETHOSU_ARCH=${ETHOS_U_NPU_ID}> $<$:ETHOSU_DRIVER_PATH=${ETHOS_U_NPU_DRIVER_SRC_PATH}> -- cgit v1.2.1