diff options
Diffstat (limited to 'source/use_case/ad')
-rw-r--r-- | source/use_case/ad/src/MainLoop.cc | 27 | ||||
-rw-r--r-- | source/use_case/ad/usecase.cmake | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/source/use_case/ad/src/MainLoop.cc b/source/use_case/ad/src/MainLoop.cc index c9d763c..4e5edc1 100644 --- a/source/use_case/ad/src/MainLoop.cc +++ b/source/use_case/ad/src/MainLoop.cc @@ -22,14 +22,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 { + namespace ad { + extern uint8_t* GetModelPointer(); + extern size_t GetModelLen(); + } /* namespace ad */ + static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; +} /* namespace app */ } /* namespace arm */ -extern uint8_t* GetModelPointer(); -extern size_t GetModelLen(); - enum opcodes { MENU_OPT_RUN_INF_NEXT = 1, /* Run on next vector */ @@ -53,7 +54,6 @@ static void DisplayMenu() fflush(stdout); } - void main_loop() { arm::app::AdModel model; /* Model wrapper object. */ @@ -61,9 +61,8 @@ void main_loop() /* Load the model. */ if (!model.Init(arm::app::tensorArena, sizeof(arm::app::tensorArena), - GetModelPointer(), - GetModelLen())) - { + arm::app::ad::GetModelPointer(), + arm::app::ad::GetModelLen())) { printf_err("failed to initialise model\n"); return; } @@ -75,10 +74,10 @@ void main_loop() caseContext.Set<arm::app::Profiler&>("profiler", profiler); caseContext.Set<arm::app::Model&>("model", model); caseContext.Set<uint32_t>("clipIndex", 0); - caseContext.Set<uint32_t>("frameLength", g_FrameLength); - caseContext.Set<uint32_t>("frameStride", g_FrameStride); - caseContext.Set<float>("scoreThreshold", g_ScoreThreshold); - caseContext.Set<float>("trainingMean", g_TrainingMean); + caseContext.Set<uint32_t>("frameLength", arm::app::ad::g_FrameLength); + caseContext.Set<uint32_t>("frameStride", arm::app::ad::g_FrameStride); + caseContext.Set<float>("scoreThreshold", arm::app::ad::g_ScoreThreshold); + caseContext.Set<float>("trainingMean", arm::app::ad::g_TrainingMean); /* Main program loop. */ bool executionSuccessful = true; diff --git a/source/use_case/ad/usecase.cmake b/source/use_case/ad/usecase.cmake index 06d7681..d19820d 100644 --- a/source/use_case/ad/usecase.cmake +++ b/source/use_case/ad/usecase.cmake @@ -86,4 +86,4 @@ generate_tflite_code( MODEL_PATH ${${use_case}_MODEL_TFLITE_PATH} DESTINATION ${SRC_GEN_DIR} EXPRESSIONS ${EXTRA_MODEL_CODE} -) + NAMESPACE "arm" "app" "ad") |