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 <kshitij.sisodia@arm.com>
diff --git a/tests/use_case/kws_asr/InitModels.cc b/tests/use_case/kws_asr/InitModels.cc
index 97aa092..85841a3 100644
--- a/tests/use_case/kws_asr/InitModels.cc
+++ b/tests/use_case/kws_asr/InitModels.cc
@@ -16,9 +16,25 @@
*/
#include "MicroNetKwsModel.hpp"
#include "Wav2LetterModel.hpp"
+#include "BufAttributes.hpp"
#include <catch.hpp>
+namespace arm {
+ namespace app {
+ static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE;
+
+ namespace asr {
+ extern uint8_t* GetModelPointer();
+ extern size_t GetModelLen();
+ }
+ namespace kws {
+ extern uint8_t* GetModelPointer();
+ extern size_t GetModelLen();
+ }
+ } /* namespace app */
+} /* namespace arm */
+
/* Skip this test, Wav2LetterModel if not Vela optimized but only from ML-zoo will fail. */
TEST_CASE("Init two Models", "[.]")
{
@@ -35,13 +51,20 @@
//arm::app::Wav2LetterModel model2; /* model2. */
/* Load/initialise the first model. */
- REQUIRE(model1.Init());
+ REQUIRE(model1.Init(arm::app::tensorArena,
+ sizeof(arm::app::tensorArena),
+ arm::app::kws::GetModelPointer(),
+ arm::app::kws::GetModelLen()));
/* Allocator instance should have been created. */
REQUIRE(nullptr != model1.GetAllocator());
/* Load the second model using the same allocator as model 1. */
- REQUIRE(model2.Init(model1.GetAllocator()));
+ REQUIRE(model2.Init(arm::app::tensorArena,
+ sizeof(arm::app::tensorArena),
+ arm::app::asr::GetModelPointer(),
+ arm::app::asr::GetModelLen(),
+ model1.GetAllocator()));
/* Make sure they point to the same allocator object. */
REQUIRE(model1.GetAllocator() == model2.GetAllocator());
@@ -49,4 +72,4 @@
/* Both models should report being initialised. */
REQUIRE(true == model1.IsInited());
REQUIRE(true == model2.IsInited());
-}
\ No newline at end of file
+}