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 --- .../use_case/img_class/ImgClassificationUCTest.cc | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'tests/use_case/img_class/ImgClassificationUCTest.cc') diff --git a/tests/use_case/img_class/ImgClassificationUCTest.cc b/tests/use_case/img_class/ImgClassificationUCTest.cc index d8339b6..1685e5f 100644 --- a/tests/use_case/img_class/ImgClassificationUCTest.cc +++ b/tests/use_case/img_class/ImgClassificationUCTest.cc @@ -25,14 +25,15 @@ #include 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 img_class { + extern uint8_t* GetModelPointer(); + extern size_t GetModelLen(); + } /* namespace img_class */ +} /* namespace app */ } /* namespace arm */ -extern uint8_t* GetModelPointer(); -extern size_t GetModelLen(); - TEST_CASE("Model info") { /* Model wrapper object. */ @@ -40,9 +41,9 @@ TEST_CASE("Model info") /* Load the model. */ REQUIRE(model.Init(arm::app::tensorArena, - sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())); + sizeof(arm::app::tensorArena), + arm::app::img_class::GetModelPointer(), + arm::app::img_class::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -63,9 +64,9 @@ TEST_CASE("Inference by index", "[.]") /* Load the model. */ REQUIRE(model.Init(arm::app::tensorArena, - sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())); + sizeof(arm::app::tensorArena), + arm::app::img_class::GetModelPointer(), + arm::app::img_class::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -99,9 +100,9 @@ TEST_CASE("Inference run all images", "[.]") /* Load the model. */ REQUIRE(model.Init(arm::app::tensorArena, - sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())); + sizeof(arm::app::tensorArena), + arm::app::img_class::GetModelPointer(), + arm::app::img_class::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -131,9 +132,9 @@ TEST_CASE("List all images") /* Load the model. */ REQUIRE(model.Init(arm::app::tensorArena, - sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())); + sizeof(arm::app::tensorArena), + arm::app::img_class::GetModelPointer(), + arm::app::img_class::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; -- cgit v1.2.1