From 8d03c19bce708f4d6efb76cb9ec3eb2fee8d681d Mon Sep 17 00:00:00 2001
From: Kshitij Sisodia <kshitij.sisodia@arm.com>
Date: Mon, 26 Sep 2022 14:15:53 +0100
Subject: MLECO-3546: Adding CMSIS pack with pidx file

Adding beta version of the CMSIS pack, created from the
main branch. Adding a corresponding PIDX file for this
pack to be linked to the public listing of Arm Keil packs.

Packs, pidx and related resources will be available under
'resources/cmsis-packs/' directory.

Change-Id: Iff6fe4d2a1cb14ae72442eb62664bf4ccd729c3c
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
---
 .../ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack    | Bin 0 -> 131076 bytes
 .../ARM.ml-embedded-eval-kit-uc-api.pdsc           | 178 +++++++++++++++++++++
 .../cmsis-packs/ml-embedded-eval-kit-uc-api.pidx   |   9 ++
 scripts/cmake/cmsis-pack-gen/use-case-api.yml      |  15 +-
 4 files changed, 190 insertions(+), 12 deletions(-)
 create mode 100644 resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack
 create mode 100644 resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.pdsc
 create mode 100644 resources/cmsis-packs/ml-embedded-eval-kit-uc-api.pidx

diff --git a/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack b/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack
new file mode 100644
index 0000000..2827568
Binary files /dev/null and b/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack differ
diff --git a/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.pdsc b/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.pdsc
new file mode 100644
index 0000000..c2b8fac
--- /dev/null
+++ b/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.pdsc
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<package schemaVersion="1.7.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PACK.xsd">
+  <name>ml-embedded-eval-kit-uc-api</name>
+
+  <description>Sample use case APIs derived from ml-embedded-eval-kit</description>
+
+  <vendor>ARM</vendor>
+
+  <license>LICENSE_APACHE_2.0.txt</license>
+
+  <url>https://review.mlplatform.org/admin/repos/ml/ethos-u/ml-embedded-evaluation-kit/</url>
+
+  <requirements>
+    <packages>
+      <package name="tensorflow-lite-micro" vendor="tensorflow" version="1.22.5-rc4"/>
+      <package name="CMSIS" vendor="ARM" version="5.9.0"/>
+    </packages>
+  </requirements>
+
+  <releases>
+    <release date="2022-08-15" version="22.8.0">Beta release package</release>
+  </releases>
+
+  <taxonomy>
+    <description Cclass="Machine Learning">Machine Learning software frameworks and libraries</description>
+    <description Cgroup="Evaluation Kit">A collection of end-to-end examples provided by Arm for Arm Cortex-M CPU and Arm Ethos-U NPU targets.</description>
+  </taxonomy>
+
+  <conditions>
+    <condition id="arm_math Condition">
+      <require Cclass="CMSIS" Cgroup="DSP"/>
+    </condition>
+    <condition id="common_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="Math"/>
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="Log"/>
+      <require Cclass="Machine Learning" Cgroup="TensorFlow"/>
+    </condition>
+    <condition id="ad_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="asr_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="img_class_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="inference_runner_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="kws_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="noise_reduction_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="object_detection_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+    <condition id="vww_api Condition">
+      <require Cclass="ML Eval Kit" Cgroup="Common" Csub="API"/>
+    </condition>
+  </conditions>
+
+  <components>
+    <component Cclass="ML Eval Kit" Cgroup="Common" Csub="Log" Cversion="1.0.0">
+      <description>Logging header-only utility</description>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Common" Csub="Math" Cversion="1.0.0" condition="arm_math Condition">
+      <description>Math function helpers dependent on CMSIS-DSP.</description>
+      <files>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Common" Csub="API" Cversion="1.0.0" condition="common_api Condition">
+      <description>Common API</description>
+      <files>
+        <file category="source" name="source/application/api/common/source/Classifier.cc"/>
+        <file category="source" name="source/application/api/common/source/ImageUtils.cc"/>
+        <file category="source" name="source/application/api/common/source/Mfcc.cc"/>
+        <file category="source" name="source/application/api/common/source/Model.cc"/>
+        <file category="source" name="source/application/api/common/source/TensorFlowLiteMicro.cc"/>
+        <file category="include" name="source/application/api/common/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Vibration" Csub="Anomaly detection" Cversion="1.0.0" condition="ad_api Condition">
+      <description>Anomaly detection use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/ad/src/AdMelSpectrogram.cc"/>
+        <file category="source" name="source/application/api/use_case/ad/src/AdModel.cc"/>
+        <file category="source" name="source/application/api/use_case/ad/src/AdProcessing.cc"/>
+        <file category="source" name="source/application/api/use_case/ad/src/MelSpectrogram.cc"/>
+        <file category="include" name="source/application/api/use_case/ad/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Voice" Csub="Automatic speech recognition" Cversion="1.0.0" condition="asr_api Condition">
+      <description>ASR use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/asr/src/AsrClassifier.cc"/>
+        <file category="source" name="source/application/api/use_case/asr/src/OutputDecode.cc"/>
+        <file category="source" name="source/application/api/use_case/asr/src/Wav2LetterMfcc.cc"/>
+        <file category="source" name="source/application/api/use_case/asr/src/Wav2LetterModel.cc"/>
+        <file category="source" name="source/application/api/use_case/asr/src/Wav2LetterPostprocess.cc"/>
+        <file category="source" name="source/application/api/use_case/asr/src/Wav2LetterPreprocess.cc"/>
+        <file category="include" name="source/application/api/use_case/asr/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Vision" Csub="Image classification" Cversion="1.0.0" condition="img_class_api Condition">
+      <description>Image classification use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/img_class/src/ImgClassProcessing.cc"/>
+        <file category="source" name="source/application/api/use_case/img_class/src/MobileNetModel.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/img_class/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Generic" Csub="Inference runner" Cversion="1.0.0" condition="inference_runner_api Condition">
+      <description>Generic inference runner use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/inference_runner/src/TestModel.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/inference_runner/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Voice" Csub="Keyword spotting" Cversion="1.0.0" condition="kws_api Condition">
+      <description>KWS use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/kws/src/KwsProcessing.cc"/>
+        <file category="source" name="source/application/api/use_case/kws/src/MicroNetKwsModel.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/kws/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Voice" Csub="Noise reduction" Cversion="1.0.0" condition="noise_reduction_api Condition">
+      <description>RNN Noise use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/noise_reduction/src/RNNoiseFeatureProcessor.cc"/>
+        <file category="source" name="source/application/api/use_case/noise_reduction/src/RNNoiseModel.cc"/>
+        <file category="source" name="source/application/api/use_case/noise_reduction/src/RNNoiseProcessing.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/noise_reduction/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Vision" Csub="Object detection" Cversion="1.0.0" condition="object_detection_api Condition">
+      <description>Object detection use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/object_detection/src/DetectorPostProcessing.cc"/>
+        <file category="source" name="source/application/api/use_case/object_detection/src/DetectorPreProcessing.cc"/>
+        <file category="source" name="source/application/api/use_case/object_detection/src/YoloFastestModel.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/object_detection/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+    <component Cclass="ML Eval Kit" Cgroup="Vision" Csub="Person detection" Cversion="1.0.0" condition="vww_api Condition">
+      <description>Visual wake word use case API.</description>
+      <files>
+        <file category="source" name="source/application/api/use_case/vww/src/VisualWakeWordModel.cc"/>
+        <file category="source" name="source/application/api/use_case/vww/src/VisualWakeWordProcessing.cc"/>
+        <file category="source" name="source/math/PlatformMath.cc"/>
+        <file category="include" name="source/application/api/use_case/vww/include/"/>
+        <file category="include" name="source/log/include/"/>
+        <file category="include" name="source/math/include/"/>
+      </files>
+    </component>
+  </components>
+</package>
+
diff --git a/resources/cmsis-packs/ml-embedded-eval-kit-uc-api.pidx b/resources/cmsis-packs/ml-embedded-eval-kit-uc-api.pidx
new file mode 100644
index 0000000..a75cb46
--- /dev/null
+++ b/resources/cmsis-packs/ml-embedded-eval-kit-uc-api.pidx
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<index schemaVersion="1.0.0" xs:noNamespaceSchemaLocation="PackIndex.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
+  <vendor>ARM</vendor>
+  <url>https://git.mlplatform.org/ml/ethos-u/ml-embedded-evaluation-kit.git/plain/resources/cmsis-packs/ml-embedded-eval-kit-uc-api.pidx</url>
+  <timestamp>2022-09-26T13:57:00</timestamp>
+  <pindex>
+    <pdsc url="https://git.mlplatform.org/ml/ethos-u/ml-embedded-evaluation-kit.git/plain/resources/cmsis-packs/ARM.ml-embedded-eval-kit-uc-api.22.8.0.pack" vendor="ARM" name="ml-embedded-eval-kit-uc-api" version="22.8.0"/>
+  </pindex>
+</index>
diff --git a/scripts/cmake/cmsis-pack-gen/use-case-api.yml b/scripts/cmake/cmsis-pack-gen/use-case-api.yml
index 8ac7b72..4d23540 100644
--- a/scripts/cmake/cmsis-pack-gen/use-case-api.yml
+++ b/scripts/cmake/cmsis-pack-gen/use-case-api.yml
@@ -46,23 +46,14 @@ packs:
 
     requirements:
       packages:
-        - attributes: {vendor: "tensorflow", name: "tensorflow-lite-micro", version: "1.22.02"}
-        - attributes: {vendor: "ARM", name: "CMSIS", version: "5.8.0"}
+        - attributes: {vendor: "tensorflow", name: "tensorflow-lite-micro", version: "1.22.5-rc4"}
+        - attributes: {vendor: "ARM", name: "CMSIS", version: "5.9.0"}
 
     releases:
       - version: "22.8.0"
         date: "2022-08-15"
         description: "Beta release package"
 
-#    @TODO: Add API header names and descriptions here (see placeholder below).
-#    apis:
-#      - name: "Image classification use case API"
-#        attributes: {Cclass: "Machine Learning", Cgroup: "Evaluation Kit", Capiversion: "1.0.0"}
-#        description: "Arm ml-embedded-eval kit example APIs"
-#        files:
-#          - name: "use_case/img_class/include/ImgClassProcessing.hpp"
-#            attributes: {category: header, attr: config, version: "1.0.0"}
-
     taxonomy:
       - attributes: {Cclass: "Machine Learning"}
         description: "Machine Learning software frameworks and libraries"
@@ -110,7 +101,7 @@ packs:
 
       - name: inference_runner_api
         target: inference_runner_api
-        attributes: {Cclass: "ML Eval Kit", Cgroup: "Common", Csub: "Generic", Cversion: "1.0.0"}
+        attributes: {Cclass: "ML Eval Kit", Cgroup: "Generic", Csub: "Inference runner", Cversion: "1.0.0"}
         description: "Generic inference runner use case API."
         dependencies: common_api
 
-- 
cgit v1.2.1