Merge pull request #121 from kshitij-sisodia-arm/feature/mleco-4001-dep-updates

MLECO-4001: Update packs to latest versions.

Author: phorsman-arm

cmsis-pack-examples/.cdefault.yml

@@ -23,14 +23,18 @@ default:
   misc:
     - for-compiler: AC6
       CPP:
-        - -std=c++14 -fno-exceptions -Wno-license-management -fno-rtti
+        - -std=c++14
+        - -fno-exceptions
+        - -Wno-license-management
+        - -fno-rtti
       C:
-        - -std=c99 -Wno-license-management
+        - -std=c99
+        - -Wno-license-management
       Link:
         - --entry=Reset_Handler
         - --verbose
         - --callgraph_file='callgraph'
         - --map
         - --info=sizes,totals,unused,compression,inline,summarysizes
         - --list='diagnostics.map'
-        - --diag_suppress=L6439W,L6314W,L9931W
+        - --diag_suppress=L6439W,L6314W,L9931W

cmsis-pack-examples/common/common.clayer.yml

@@ -1,4 +1,4 @@
-#  SPDX-FileCopyrightText: Copyright 2022 Arm Limited and/or its
+#  SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its
 #  affiliates <open-source-office@arm.com>
 #  SPDX-License-Identifier: Apache-2.0
 #
@@ -26,9 +26,14 @@ layer:
       files:
         - file: include/BufAttributes.hpp
         - file: include/ethosu_mem_config.h
-    - group: CMSIS Extra
-      files:
-        - file: src/arm_nn_softmax_common_s8.c
+
+  # Workaround 4001: for TensorFlow's pack referring to
+  # CMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE.
+  # Can be removed once the pack has been fixed.
+  misc:
+    - for-compiler: AC6
+      CPP:
+        - "-include \"RTE_Components.h\""
 
   components:
     - component: ARM::CMSIS:CORE
@@ -39,6 +44,9 @@ layer:
     - component: tensorflow::Data Processing:Math:kissfft
     - component: tensorflow::Data Processing:Math:ruy
     - component: tensorflow::Machine Learning:TensorFlow:Kernel Utils
+      # Workaround 4001 (see description above)
+      define:
+        - CMSIS_DEVICE_ARM_CORTEX_M_XX_HEADER_FILE=CMSIS_device_header
     - component: tensorflow::Machine Learning:TensorFlow:Testing
     - component: ARM::ML Eval Kit:Common:API
     - component: ARM::ML Eval Kit:Common:Log

cmsis-pack-examples/common/src/arm_nn_softmax_common_s8.c

@@ -20,13 +20,15 @@ solution:
 
   packs:
     - pack: ARM::CMSIS@5.9.0
-    - pack: Arm::ethos-u-core-driver@1.22.5-rc4
+    - pack: ARM::CMSIS-DSP@1.14.4
+    - pack: ARM::CMSIS-NN@4.0.0
+    - pack: Arm::ethos-u-core-driver@1.22.8
     - pack: ARM::ml-embedded-eval-kit-uc-api@22.8.0-Beta
-    - pack: tensorflow::flatbuffers@1.22.5-rc4
-    - pack: tensorflow::gemmlowp@1.22.5-rc4
-    - pack: tensorflow::kissfft@1.22.5-rc4
-    - pack: tensorflow::ruy@1.22.5-rc4
-    - pack: tensorflow::tensorflow-lite-micro@1.22.5-rc4
+    - pack: tensorflow::flatbuffers@1.22.8
+    - pack: tensorflow::gemmlowp@1.22.8
+    - pack: tensorflow::kissfft@1.22.8
+    - pack: tensorflow::ruy@1.22.8
+    - pack: tensorflow::tensorflow-lite-micro@1.22.8
 
     - pack: ARM::V2M_MPS3_SSE_300_BSP@1.3.0
     - pack: ARM::V2M_MPS3_SSE_310_BSP@1.0.0