diff options
author | alexander <alexander.efremov@arm.com> | 2022-02-10 16:15:54 +0000 |
---|---|---|
committer | alexander <alexander.efremov@arm.com> | 2022-02-10 18:04:42 +0000 |
commit | 31ae9f09bb3535975595e999fbc7baca889e46e8 (patch) | |
tree | 71f0cadc2620b9d18e474e5d40eda7b3d30a8ce4 /source/use_case/kws_asr | |
parent | 3107aa2152de9be8317e62da1d0327bcad6552e2 (diff) | |
download | ml-embedded-evaluation-kit-31ae9f09bb3535975595e999fbc7baca889e46e8.tar.gz |
MLECO-2682: CMake and source refactoring.
MLECO-2930: logging macros were extracted from hal.h and used separately around the code.
MLECO-2931: arm_math lib introduced, cmsis-dsp removed from top level linkage.
MLECO-2915: platform related post-build steps.
Change-Id: Id718884e22f262a5c070ded3f3f5d4b048820147
Signed-off-by: alexander <alexander.efremov@arm.com>
Diffstat (limited to 'source/use_case/kws_asr')
9 files changed, 8 insertions, 7 deletions
diff --git a/source/use_case/kws_asr/include/Wav2LetterPostprocess.hpp b/source/use_case/kws_asr/include/Wav2LetterPostprocess.hpp index 5c11412..029a641 100644 --- a/source/use_case/kws_asr/include/Wav2LetterPostprocess.hpp +++ b/source/use_case/kws_asr/include/Wav2LetterPostprocess.hpp @@ -18,7 +18,6 @@ #define KWS_ASR_WAV2LET_POSTPROC_HPP #include "TensorFlowLiteMicro.hpp" /* TensorFlow headers */ -#include "hal.h" /* stdout facility */ namespace arm { namespace app { diff --git a/source/use_case/kws_asr/include/Wav2LetterPreprocess.hpp b/source/use_case/kws_asr/include/Wav2LetterPreprocess.hpp index 66d19d3..3609c49 100644 --- a/source/use_case/kws_asr/include/Wav2LetterPreprocess.hpp +++ b/source/use_case/kws_asr/include/Wav2LetterPreprocess.hpp @@ -21,6 +21,7 @@ #include "Wav2LetterMfcc.hpp" #include "AudioUtils.hpp" #include "DataStructures.hpp" +#include "log_macros.h" namespace arm { namespace app { diff --git a/source/use_case/kws_asr/src/AsrClassifier.cc b/source/use_case/kws_asr/src/AsrClassifier.cc index 3f9cd7b..9c18b14 100644 --- a/source/use_case/kws_asr/src/AsrClassifier.cc +++ b/source/use_case/kws_asr/src/AsrClassifier.cc @@ -16,7 +16,7 @@ */ #include "AsrClassifier.hpp" -#include "hal.h" +#include "log_macros.h" #include "TensorFlowLiteMicro.hpp" #include "Wav2LetterModel.hpp" diff --git a/source/use_case/kws_asr/src/MainLoop.cc b/source/use_case/kws_asr/src/MainLoop.cc index c7e977f..a2beab3 100644 --- a/source/use_case/kws_asr/src/MainLoop.cc +++ b/source/use_case/kws_asr/src/MainLoop.cc @@ -26,6 +26,7 @@ #include "UseCaseHandler.hpp" /* Handlers for different user options. */ #include "Wav2LetterPreprocess.hpp" /* ASR pre-processing class. */ #include "Wav2LetterPostprocess.hpp"/* ASR post-processing class. */ +#include "log_macros.h" using KwsClassifier = arm::app::Classifier; diff --git a/source/use_case/kws_asr/src/MicroNetKwsModel.cc b/source/use_case/kws_asr/src/MicroNetKwsModel.cc index 4b44580..663faa0 100644 --- a/source/use_case/kws_asr/src/MicroNetKwsModel.cc +++ b/source/use_case/kws_asr/src/MicroNetKwsModel.cc @@ -15,8 +15,7 @@ * limitations under the License. */ #include "MicroNetKwsModel.hpp" - -#include "hal.h" +#include "log_macros.h" namespace arm { namespace app { diff --git a/source/use_case/kws_asr/src/UseCaseHandler.cc b/source/use_case/kws_asr/src/UseCaseHandler.cc index a3ebdb1..bfc1d25 100644 --- a/source/use_case/kws_asr/src/UseCaseHandler.cc +++ b/source/use_case/kws_asr/src/UseCaseHandler.cc @@ -30,6 +30,7 @@ #include "AsrResult.hpp" #include "AsrClassifier.hpp" #include "OutputDecode.hpp" +#include "log_macros.h" using KwsClassifier = arm::app::Classifier; diff --git a/source/use_case/kws_asr/src/Wav2LetterMfcc.cc b/source/use_case/kws_asr/src/Wav2LetterMfcc.cc index ae9e57a..f2c50f3 100644 --- a/source/use_case/kws_asr/src/Wav2LetterMfcc.cc +++ b/source/use_case/kws_asr/src/Wav2LetterMfcc.cc @@ -17,6 +17,7 @@ #include "Wav2LetterMfcc.hpp" #include "PlatformMath.hpp" +#include "log_macros.h" #include <cfloat> diff --git a/source/use_case/kws_asr/src/Wav2LetterModel.cc b/source/use_case/kws_asr/src/Wav2LetterModel.cc index affa1a6..52bd23a 100644 --- a/source/use_case/kws_asr/src/Wav2LetterModel.cc +++ b/source/use_case/kws_asr/src/Wav2LetterModel.cc @@ -15,8 +15,7 @@ * limitations under the License. */ #include "Wav2LetterModel.hpp" - -#include "hal.h" +#include "log_macros.h" namespace arm { namespace app { diff --git a/source/use_case/kws_asr/src/Wav2LetterPostprocess.cc b/source/use_case/kws_asr/src/Wav2LetterPostprocess.cc index f2d9357..2a76b1b 100644 --- a/source/use_case/kws_asr/src/Wav2LetterPostprocess.cc +++ b/source/use_case/kws_asr/src/Wav2LetterPostprocess.cc @@ -15,8 +15,8 @@ * limitations under the License. */ #include "Wav2LetterPostprocess.hpp" - #include "Wav2LetterModel.hpp" +#include "log_macros.h" namespace arm { namespace app { |