diff options
| author | Richard Burton <richard.burton@arm.com> | 2022-03-04 09:19:09 +0000 |
|---|---|---|
| committer | Richard <richard.burton@arm.com> | 2022-03-04 09:45:29 +0000 |
| commit | b4123fd715e41070be5bb39600625c740185f562 (patch) | |
| tree | 78ff9672a8adcdd9d97b40a3de17a6985b1a6659 /scripts | |
| parent | 2aa31324349f64ac1a6596006c6c88dcbc596a49 (diff) | |
| download | ml-embedded-evaluation-kit-b4123fd715e41070be5bb39600625c740185f562.tar.gz | |
MLECO-2978: Update to 22.02 dependencies
* Core-platform now a depdenency for timing adapter
Signed-off-by: Richard Burton <richard.burton@arm.com>
Change-Id: I54f3773bdf91083fa1513be15372fcf2231bea2c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/common_user_options.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/tensorflow.cmake | 8 | ||||
| -rw-r--r-- | scripts/py/requirements.txt | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/scripts/cmake/common_user_options.cmake b/scripts/cmake/common_user_options.cmake index a077264..ae35925 100644 --- a/scripts/cmake/common_user_options.cmake +++ b/scripts/cmake/common_user_options.cmake @@ -88,7 +88,7 @@ if (NOT TARGET_PLATFORM STREQUAL native) if (ETHOS_U_NPU_ENABLED) USER_OPTION(ETHOS_U_NPU_TIMING_ADAPTER_SRC_PATH "Path to Ethos-U NPU timing adapter sources" - "${DEPENDENCY_ROOT_DIR}/core-software/drivers/timing_adapter" + "${DEPENDENCY_ROOT_DIR}/core-platform/drivers/timing_adapter" PATH ) diff --git a/scripts/cmake/tensorflow.cmake b/scripts/cmake/tensorflow.cmake index 284c70a..127724b 100644 --- a/scripts/cmake/tensorflow.cmake +++ b/scripts/cmake/tensorflow.cmake @@ -54,7 +54,7 @@ else() if(ETHOS_U_NPU_ENABLED) # Arm Ethos-U55 NPU is the co-processor for ML workload: set(TENSORFLOW_LITE_MICRO_CO_PROCESSOR "ethos_u") - string(TOLOWER ${ETHOS_U_NPU_ID} ETHOSU_ARCH) + set(ETHOS_U_NPU_ID "u55") # Currently only u55 is supported by TFLite Micro. endif() set(TENSORFLOW_LITE_MICRO_OPTIMIZED_KERNEL "cmsis_nn") @@ -68,10 +68,6 @@ if (TENSORFLOW_LITE_MICRO_CLEAN_BUILD) list(APPEND MAKE_TARGETS_LIST "clean") endif() -if (ETHOS_U_NPU_ID) - string(TOLOWER ${ETHOS_U_NPU_ID} ETHOSU_ARCH) -endif() - # Primary target list(APPEND MAKE_TARGETS_LIST "microlite") message(STATUS "TensorFlow Lite Micro build to be called for these targets: ${MAKE_TARGETS_LIST}") @@ -89,7 +85,7 @@ add_custom_target(tensorflow_build ALL BUILD_TYPE=${TENSORFLOW_LITE_MICRO_BUILD_TYPE} CMSIS_PATH=${CMSIS_SRC_PATH} # Conditional arguments - $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_ARCH=${ETHOSU_ARCH}> + $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_ARCH=${ETHOS_U_NPU_ID}> $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_DRIVER_PATH=${ETHOS_U_NPU_DRIVER_SRC_PATH}> $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_DRIVER_LIBS=$<TARGET_FILE:ethosu_core_driver>> diff --git a/scripts/py/requirements.txt b/scripts/py/requirements.txt index 6330f58..ce74502 100644 --- a/scripts/py/requirements.txt +++ b/scripts/py/requirements.txt @@ -3,7 +3,7 @@ Jinja2==2.11.2 llvmlite==0.33.0 MarkupSafe==1.1.1 numba==0.50.1 -numpy==1.17.4 +numpy==1.19.2 Pillow==7.0.0 pycparser==2.20 resampy==0.2.2 |