MLECO-3101: Minor changes for CMSIS pack
Improvements based on feedback from initial tests done with
the generated pack.
Change-Id: Ia769dd6264c53e6b9337473e1c50bdfa6469a216
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
diff --git a/scripts/cmake/cmsis-pack-gen/CMakeLists.txt b/scripts/cmake/cmsis-pack-gen/CMakeLists.txt
index 2a25aec..2774ab2 100644
--- a/scripts/cmake/cmsis-pack-gen/CMakeLists.txt
+++ b/scripts/cmake/cmsis-pack-gen/CMakeLists.txt
@@ -51,3 +51,12 @@
foreach(API ${UC_API_LIST})
add_subdirectory(${API} ${CMAKE_BINARY_DIR}/${API})
endforeach()
+
+# Any custom steps that are required for the CMSIS pack generation flow
+# must be declared here:
+if (CMSIS_PACK_GEN_FLOW)
+ # For CMSIS packs, we need CMSIS DSP definition.
+ # @TODO: Currently, this line is added multiple times to the include file. Uncomment when
+ # packgen is fixed.
+ # add_compile_definitions(arm_math PRIVATE ARM_MATH_DSP)
+endif()
diff --git a/scripts/cmake/cmsis-pack-gen/use-case-api.yml b/scripts/cmake/cmsis-pack-gen/use-case-api.yml
index 9620e17..8796dff 100644
--- a/scripts/cmake/cmsis-pack-gen/use-case-api.yml
+++ b/scripts/cmake/cmsis-pack-gen/use-case-api.yml
@@ -35,7 +35,7 @@
build:
- name: "build-dir"
- options: "cmake"
+ options: "cmake -DCMSIS_PACK_GEN_FLOW=ON"
packs:
- name: "ml-embedded-eval-kit-uc-api"
@@ -79,11 +79,16 @@
target: arm_math
attributes: { Cclass: "Machine Learning", Cgroup: "Evaluation Kit", Csub: "Common: Math", Cversion: "1.0.0" }
description: "Math function helpers dependent on CMSIS-DSP."
+ conditions:
+ - require: { Cclass: "CMSIS", Cgroup: "DSP"}
- name: common_api
target: common_api
attributes: {Cclass: "Machine Learning", Cgroup: "Evaluation Kit", Csub: "Common: API", Cversion: "1.0.0"}
description: "Common API"
+ dependencies: ["arm_math", "log"]
+ conditions:
+ - require: { Cclass: "Machine Learning", Cgroup: "TensorFlow" }
- name: ad_api
target: ad_api