diff options
| author | Liam Barry <liam.barry@arm.com> | 2022-05-09 17:06:19 +0100 |
|---|---|---|
| committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-05-12 16:10:06 +0000 |
| commit | 213a543dd0d07b2f8d51a9c7e2055fd99291c960 (patch) | |
| tree | 7357c9961f395131140f8937e732fee68963dc63 /source/use_case/vww | |
| parent | dd44d29775e53ad311e1997bb8a7670d0ee6383e (diff) | |
| download | ml-embedded-evaluation-kit-213a543dd0d07b2f8d51a9c7e2055fd99291c960.tar.gz | |
MLECO-3186: Each use case should same namespace convention as KWS and ASR
Certain UCs required additional work due to case context variables which also
became part of a namespace in generated files.
Solution was to declare these extra variables as part of the UC namespace in the respective model.hpp files.
Additional changes to standardise use of namespaces may be required - proposing new task.
Minor typo and rewording of customizing.md in relevant sections included.
Signed-off-by: Liam Barry <liam.barry@arm.com>
Change-Id: Ie78f82a30be252cb841136ea5115f21fc8d762cb
Diffstat (limited to 'source/use_case/vww')
| -rw-r--r-- | source/use_case/vww/src/MainLoop.cc | 17 | ||||
| -rw-r--r-- | source/use_case/vww/usecase.cmake | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/use_case/vww/src/MainLoop.cc b/source/use_case/vww/src/MainLoop.cc index fae7530..4fb5df7 100644 --- a/source/use_case/vww/src/MainLoop.cc +++ b/source/use_case/vww/src/MainLoop.cc @@ -25,14 +25,15 @@ #include "BufAttributes.hpp" /* Buffer attributes to be applied */ namespace arm { - namespace app { - static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; - } /* namespace app */ +namespace app { + static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; + namespace vww { + extern uint8_t* GetModelPointer(); + extern size_t GetModelLen(); + } /* namespace vww */ +} /* namespace app */ } /* namespace arm */ -extern uint8_t* GetModelPointer(); -extern size_t GetModelLen(); - using ViusalWakeWordClassifier = arm::app::Classifier; void main_loop() @@ -42,8 +43,8 @@ void main_loop() /* Load the model. */ if (!model.Init(arm::app::tensorArena, sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())) { + arm::app::vww::GetModelPointer(), + arm::app::vww::GetModelLen())) { printf_err("Failed to initialise model\n"); return; } diff --git a/source/use_case/vww/usecase.cmake b/source/use_case/vww/usecase.cmake index f6a3efe..7ef4596 100644 --- a/source/use_case/vww/usecase.cmake +++ b/source/use_case/vww/usecase.cmake @@ -48,7 +48,7 @@ USER_OPTION(${use_case}_MODEL_TFLITE_PATH "NN models file to be used in the eval generate_tflite_code( MODEL_PATH ${${use_case}_MODEL_TFLITE_PATH} DESTINATION ${SRC_GEN_DIR} -) + NAMESPACE "arm" "app" "vww") # Generate labels file set(${use_case}_LABELS_CPP_FILE Labels) |