Updates

MDK-Packs · Jun 17, 2024 · c3c790e · c3c790e
1 parent f303cc6
commit c3c790e
Show file tree

Hide file tree

Showing 31 changed files with 1,898 additions and 1,651 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -8,6 +8,9 @@ RUN apt-get update -y && apt-get upgrade -y
 
 RUN apt-get install rsync wget git zip curl ninja-build -y --fix-missing
 
-RUN pip3 install pillow requests six semantic_version pyyml
+RUN curl -fsSL https://get.docker.com -o get-docker.sh
+RUN sh ./get-docker.sh
 
+RUN pip3 install pillow requests six semantic_version pyyml
 
+ENV DOCKER_HOST=unix:///var/run/user/1000/docker.sock
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 *.o
 *.d
 *.map
-*.lst
 *.lnp
 *.dep
 *._cc
@@ -20,3 +19,11 @@ tensorflow-test-ng/gen/
 *.pack
 3rdparty-build/PackName.txt
 *.raw
+/tensorflow-examples/gen
+/out
+/tensorflow-examples/out
+/tensorflow-test/HelloWorld/tmp
+/3rdparty-build/flatbuffers/build
+/3rdparty-build/gemmlowp/build
+/3rdparty-build/kissfft/build
+/3rdparty-build/ruy/build
diff --git a/tensorflow-test/HelloWorld/HelloWorld.cproject.yml b/tensorflow-test/HelloWorld/HelloWorld.cproject.yml
@@ -3,17 +3,16 @@ project:
   debug: on
 
   packs:
-    - pack: ARM::CMSIS
-    - pack: ARM::CMSIS-DSP
-    - pack: ARM::CMSIS-NN
-      # path: ../
-    - pack: ARM::Cortex_DFP
-      # path: ../
-    - pack: tensorflow::tensorflow-lite-micro
-    - pack: tensorflow::flatbuffers
-    - pack: tensorflow::gemmlowp
-    - pack: tensorflow::kissfft
-    - pack: tensorflow::ruy
+    - pack: ARM::[email protected]
+    - pack: ARM::[email protected]
+    - pack: ARM::[email protected]
+    - pack: ARM::[email protected]
+    - pack: tensorflow::[email protected]
+    - pack: tensorflow::[email protected]
+    - pack: tensorflow::[email protected]
+    - pack: tensorflow::[email protected]
+    - pack: tensorflow::[email protected]
+    - pack: ARM::[email protected]
 
   add-path:
     - ./hello_world
@@ -23,16 +22,17 @@ project:
 
   components:
     - component: ARM::CMSIS:DSP&Source
-    - component: ARM::CMSIS:NN Lib
-    - component: tensorflow::Data Exchange:Serialization:flatbuffers
-    - component: tensorflow::Data Processing:Math:gemmlowp fixed-point&tensorflow
+    - component: ARM::CMSIS:NN [email protected]
+    - component: ARM::CMSIS:[email protected]
+    - component: ARM::Device:Startup&C Startup
+    - component: tensorflow::Machine Learning:TensorFlow:Kernel&CMSIS-NN
+    - component: tensorflow::Machine Learning:TensorFlow:Kernel&Reference
+    - component: tensorflow::Data Exchange:Serialization:flatbuffers&tensorflow
     - component: tensorflow::Data Processing:Math:kissfft&tensorflow
+    - component: tensorflow::Data Processing:Math:gemmlowp fixed-point&tensorflow
     - component: tensorflow::Data Processing:Math:ruy&tensorflow
-    - component: tensorflow::Machine Learning:TensorFlow:Kernel&Reference
     - component: tensorflow::Machine Learning:TensorFlow:Kernel Utils
-    - component: tensorflow::Machine Learning:TensorFlow:Testing
-    - component: ARM::CMSIS:[email protected]
-    - component: ARM::Device:Startup&C Startup
+    #- component: tensorflow::Machine Learning:TensorFlow:Signal Library&Reference
 
   groups:
     - group: TFL_main

diff --git a/tensorflow-test/HelloWorld/HelloWorld.csolution.yml b/tensorflow-test/HelloWorld/HelloWorld.csolution.yml
@@ -1,5 +1,5 @@
 solution:
-  created-for: cmsis-toobox@2.0.0
+  created-for: cmsis-toobox@2.4.0
 
   cdefault:
   misc:
@@ -17,7 +17,7 @@ solution:
         - -Wl,--gc-sections
 
   packs:
-    - pack: ARM::Cortex_DFP
+    - pack: ARM::Cortex_DFP@1.1.0
 
   target-types:
     - type: CM0

diff --git a/tensorflow-test/HelloWorld/HelloWorld.size+CM55.cbuild.yml b/tensorflow-test/HelloWorld/HelloWorld.size+CM55.cbuild.yml
diff --git a/tensorflow-test/HelloWorld/HelloWorld.size+CM55.cprj b/tensorflow-test/HelloWorld/HelloWorld.size+CM55.cprj
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <cprj schemaVersion="2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CPRJ.xsd">
-  <created timestamp="2024-05-06T14:39:17" tool="csolution 2.1.0"/>
+  <created timestamp="2024-06-12T10:36:27" tool="csolution 2.1.0"/>
 
   <info isLayer="false">
     <description>Automatically generated project</description>
   </info>
 
   <packages>
     <package name="CMSIS-DSP" vendor="ARM" version="1.15.0:1.15.0"/>
-    <package name="CMSIS-NN" vendor="ARM" version="4.1.0:4.1.0"/>
+    <package name="CMSIS-NN" vendor="ARM" version="6.0.0:6.0.0"/>
     <package name="CMSIS" vendor="ARM" version="6.0.0:6.0.0"/>
-    <package name="Cortex_DFP" vendor="ARM" version="1.0.0:1.0.0"/>
-    <package name="flatbuffers" vendor="tensorflow" version="1.24.2:1.24.2"/>
-    <package name="gemmlowp" vendor="tensorflow" version="1.24.2:1.24.2"/>
-    <package name="kissfft" vendor="tensorflow" version="1.24.2:1.24.2"/>
-    <package name="ruy" vendor="tensorflow" version="1.24.2:1.24.2"/>
-    <package name="tensorflow-lite-micro" vendor="tensorflow" version="1.24.2:1.24.2"/>
+    <package name="Cortex_DFP" vendor="ARM" version="1.1.0:1.1.0"/>
+    <package name="flatbuffers" vendor="tensorflow" version="1.24.5:1.24.5"/>
+    <package name="gemmlowp" vendor="tensorflow" version="1.24.5:1.24.5"/>
+    <package name="kissfft" vendor="tensorflow" version="1.24.5:1.24.5"/>
+    <package name="ruy" vendor="tensorflow" version="1.24.5:1.24.5"/>
+    <package name="tensorflow-lite-micro" vendor="tensorflow" version="1.24.5:1.24.5"/>
   </packages>
 
   <compilers>
@@ -36,23 +36,23 @@
   <components>
     <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="6.0.0"/>
     <component Cclass="CMSIS" Cgroup="DSP" Cvariant="Source" Cvendor="ARM" Cversion="1.15.0"/>
-    <component Cclass="CMSIS" Cgroup="NN Lib" Cvendor="ARM" Cversion="4.1.0"/>
+    <component Cclass="CMSIS" Cgroup="NN Lib" Cvendor="ARM" Cversion="6.0.0"/>
     <component Cclass="Device" Cgroup="Startup" Cvariant="C Startup" Cvendor="ARM" Cversion="2.2.0">
       <file attr="config" category="linkerScript" name="Device/ARMCM55/Config/ARMCM55_ac6.sct" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARMCM55/Source/startup_ARMCM55.c" version="1.1.0"/>
       <file attr="config" category="sourceC" name="Device/ARMCM55/Source/system_ARMCM55.c" version="1.1.0"/>
     </component>
-    <component Cclass="Data Exchange" Cgroup="Serialization" Csub="flatbuffers" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.2"/>
-    <component Cclass="Data Processing" Cgroup="Math" Csub="gemmlowp fixed-point" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.2"/>
-    <component Cclass="Data Processing" Cgroup="Math" Csub="kissfft" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.2"/>
-    <component Cclass="Data Processing" Cgroup="Math" Csub="ruy" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.2"/>
-    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="1.24.2">
-      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/debug_log.cpp" version="1.24.2"/>
-      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/micro_time.cpp" version="1.24.2"/>
-      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/system_setup.cpp" version="1.24.2"/>
+    <component Cclass="Data Exchange" Cgroup="Serialization" Csub="flatbuffers" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.5"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="gemmlowp fixed-point" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.5"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="kissfft" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.5"/>
+    <component Cclass="Data Processing" Cgroup="Math" Csub="ruy" Cvariant="tensorflow" Cvendor="tensorflow" Cversion="1.24.5"/>
+    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel Utils" Cvendor="tensorflow" Cversion="1.24.5">
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/debug_log.cpp" version="1.24.5"/>
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/cortex_m_generic/micro_time.cpp" version="1.24.5"/>
+      <file attr="config" category="sourceCpp" name="tensorflow/lite/micro/system_setup.cpp" version="1.24.5"/>
     </component>
-    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="Reference" Cvendor="tensorflow" Cversion="1.24.2"/>
-    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Testing" Cvendor="tensorflow" Cversion="1.24.2"/>
+    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="CMSIS-NN" Cvendor="tensorflow" Cversion="1.24.5"/>
+    <component Cclass="Machine Learning" Cgroup="TensorFlow" Csub="Kernel" Cvariant="Reference" Cvendor="tensorflow" Cversion="1.24.5"/>
   </components>
 
   <files>