From 213a543dd0d07b2f8d51a9c7e2055fd99291c960 Mon Sep 17 00:00:00 2001 From: Liam Barry Date: Mon, 9 May 2022 17:06:19 +0100 Subject: 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 Change-Id: Ie78f82a30be252cb841136ea5115f21fc8d762cb --- source/use_case/vww/src/MainLoop.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source/use_case/vww/src/MainLoop.cc') 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; } -- cgit v1.2.1