From aa4bcb14d0cbee910331545dd2fc086b58c37170 Mon Sep 17 00:00:00 2001 From: Kshitij Sisodia Date: Fri, 6 May 2022 09:13:03 +0100 Subject: MLECO-3183: Refactoring application sources Platform agnostic application sources are moved into application api module with their own independent CMake projects. Changes for MLECO-3080 also included - they create CMake projects individial API's (again, platform agnostic) that dependent on the common logic. The API for KWS_API "joint" API has been removed and now the use case relies on individual KWS, and ASR API libraries. Change-Id: I1f7748dc767abb3904634a04e0991b74ac7b756d Signed-off-by: Kshitij Sisodia --- tests/use_case/kws/InferenceTestMicroNetKws.cc | 22 ++++++++++++-- tests/use_case/kws/KWSHandlerTest.cc | 40 ++++++++++++++++++++------ 2 files changed, 51 insertions(+), 11 deletions(-) (limited to 'tests/use_case/kws') diff --git a/tests/use_case/kws/InferenceTestMicroNetKws.cc b/tests/use_case/kws/InferenceTestMicroNetKws.cc index 41ecc3c..a6f7a03 100644 --- a/tests/use_case/kws/InferenceTestMicroNetKws.cc +++ b/tests/use_case/kws/InferenceTestMicroNetKws.cc @@ -17,10 +17,22 @@ #include "MicroNetKwsModel.hpp" #include "TestData_kws.hpp" #include "TensorFlowLiteMicro.hpp" +#include "BufAttributes.hpp" #include #include +namespace arm { +namespace app { + static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; + + namespace kws { + extern uint8_t *GetModelPointer(); + extern size_t GetModelLen(); + } /* namespace kws */ +} /* namespace app */ +} /* namespace arm */ + using namespace test; bool RunInference(arm::app::Model& model, const int8_t vec[]) @@ -78,7 +90,10 @@ TEST_CASE("Running random inference with TensorFlow Lite Micro and MicroNetKwsMo arm::app::MicroNetKwsModel model{}; REQUIRE_FALSE(model.IsInited()); - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); REQUIRE(model.IsInited()); REQUIRE(RunInferenceRandom(model)); @@ -96,7 +111,10 @@ TEST_CASE("Running inference with TensorFlow Lite Micro and MicroNetKwsModel int arm::app::MicroNetKwsModel model{}; REQUIRE_FALSE(model.IsInited()); - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); REQUIRE(model.IsInited()); TestInference(input_goldenFV, output_goldenFV, model); diff --git a/tests/use_case/kws/KWSHandlerTest.cc b/tests/use_case/kws/KWSHandlerTest.cc index c24faa4..d9d00a8 100644 --- a/tests/use_case/kws/KWSHandlerTest.cc +++ b/tests/use_case/kws/KWSHandlerTest.cc @@ -24,13 +24,26 @@ #include "Classifier.hpp" #include "UseCaseCommonUtils.hpp" +namespace arm { + namespace app { + static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; + namespace kws { + extern uint8_t* GetModelPointer(); + extern size_t GetModelLen(); + } + } /* namespace app */ +} /* namespace arm */ + TEST_CASE("Model info") { /* Model wrapper object. */ arm::app::MicroNetKwsModel model; /* Load the model. */ - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -50,7 +63,10 @@ TEST_CASE("Inference by index") arm::app::MicroNetKwsModel model; /* Load the model. */ - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -58,8 +74,8 @@ TEST_CASE("Inference by index") arm::app::Profiler profiler{"kws"}; caseContext.Set("profiler", profiler); caseContext.Set("model", model); - caseContext.Set("frameLength", g_FrameLength); /* 640 sample length for MicroNetKws. */ - caseContext.Set("frameStride", g_FrameStride); /* 320 sample stride for MicroNetKws. */ + caseContext.Set("frameLength", arm::app::kws::g_FrameLength); /* 640 sample length for MicroNetKws. */ + caseContext.Set("frameStride", arm::app::kws::g_FrameStride); /* 320 sample stride for MicroNetKws. */ caseContext.Set("scoreThreshold", 0.5); /* Normalised score threshold. */ arm::app::Classifier classifier; /* classifier wrapper object. */ @@ -122,7 +138,10 @@ TEST_CASE("Inference run all clips") arm::app::MicroNetKwsModel model; /* Load the model. */ - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -131,8 +150,8 @@ TEST_CASE("Inference run all clips") caseContext.Set("profiler", profiler); caseContext.Set("model", model); caseContext.Set("clipIndex", 0); - caseContext.Set("frameLength", g_FrameLength); /* 640 sample length for MicroNet. */ - caseContext.Set("frameStride", g_FrameStride); /* 320 sample stride for MicroNet. */ + caseContext.Set("frameLength", arm::app::kws::g_FrameLength); /* 640 sample length for MicroNet. */ + caseContext.Set("frameStride", arm::app::kws::g_FrameStride); /* 320 sample stride for MicroNet. */ caseContext.Set("scoreThreshold", 0.7); /* Normalised score threshold. */ arm::app::Classifier classifier; /* classifier wrapper object. */ caseContext.Set("classifier", classifier); @@ -153,7 +172,10 @@ TEST_CASE("List all audio clips") arm::app::MicroNetKwsModel model; /* Load the model. */ - REQUIRE(model.Init()); + REQUIRE(model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + arm::app::kws::GetModelPointer(), + arm::app::kws::GetModelLen())); /* Instantiate application context. */ arm::app::ApplicationContext caseContext; @@ -161,4 +183,4 @@ TEST_CASE("List all audio clips") caseContext.Set("model", model); REQUIRE(arm::app::ListFilesHandler(caseContext)); -} \ No newline at end of file +} -- cgit v1.2.1