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 /tests/use_case/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 'tests/use_case/asr')
| -rw-r--r-- | tests/use_case/asr/AsrFeaturesTests.cc | 4 | ||||
| -rw-r--r-- | tests/use_case/asr/InferenceTestWav2Letter.cc | 1 | ||||
| -rw-r--r-- | tests/use_case/asr/MfccTests.cc | 9 | ||||
| -rw-r--r-- | tests/use_case/asr/Wav2LetterPreprocessingTest.cc | 11 |
4 files changed, 3 insertions, 22 deletions
diff --git a/tests/use_case/asr/AsrFeaturesTests.cc b/tests/use_case/asr/AsrFeaturesTests.cc index 59fe29b..940c25f 100644 --- a/tests/use_case/asr/AsrFeaturesTests.cc +++ b/tests/use_case/asr/AsrFeaturesTests.cc @@ -16,10 +16,10 @@ */ #include "DataStructures.hpp" #include "AsrGoldenFeatures.hpp" -#include "hal.h" -#include "TensorFlowLiteMicro.hpp" #include "Wav2LetterPreprocess.hpp" +#include "log_macros.h" + #include <catch.hpp> #include <random> diff --git a/tests/use_case/asr/InferenceTestWav2Letter.cc b/tests/use_case/asr/InferenceTestWav2Letter.cc index 3e30bd2..53c92ab 100644 --- a/tests/use_case/asr/InferenceTestWav2Letter.cc +++ b/tests/use_case/asr/InferenceTestWav2Letter.cc @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "hal.h" #include "TensorFlowLiteMicro.hpp" #include "Wav2LetterModel.hpp" #include "TestData_asr.hpp" diff --git a/tests/use_case/asr/MfccTests.cc b/tests/use_case/asr/MfccTests.cc index c70e53e..7568661 100644 --- a/tests/use_case/asr/MfccTests.cc +++ b/tests/use_case/asr/MfccTests.cc @@ -135,15 +135,6 @@ template void TestQuantisedMFCC<int16_t>(); TEST_CASE("MFCC calculation") { - hal_platform platform; - data_acq_module dataAcq; - data_psn_module dataPsn; - platform_timer timer; - - /* Initialise the HAL and platform. */ - hal_init(&platform, &dataAcq, &dataPsn, &timer); - hal_platform_init(&platform); - SECTION("FP32") { auto mfccOutput = GetMFCCInstance().MfccCompute(testWav1); diff --git a/tests/use_case/asr/Wav2LetterPreprocessingTest.cc b/tests/use_case/asr/Wav2LetterPreprocessingTest.cc index 8af9014..457257f 100644 --- a/tests/use_case/asr/Wav2LetterPreprocessingTest.cc +++ b/tests/use_case/asr/Wav2LetterPreprocessingTest.cc @@ -17,7 +17,6 @@ #include "Wav2LetterPreprocess.hpp" #include <limits> -#include <algorithm> #include <catch.hpp> constexpr uint32_t numMfccFeatures = 13; @@ -97,14 +96,6 @@ void PopulateTestWavVector(std::vector<int16_t>& vec) TEST_CASE("Preprocessing calculation INT8") { - /* Initialise the HAL and platform. */ - hal_platform platform; - data_acq_module data_acq; - data_psn_module data_psn; - platform_timer timer; - hal_init(&platform, &data_acq, &data_psn, &timer); - hal_platform_init(&platform); - /* Constants. */ const uint32_t windowLen = 512; const uint32_t windowStride = 160; @@ -135,7 +126,7 @@ TEST_CASE("Preprocessing calculation INT8") REQUIRE(prep.Invoke(testWav.data(), testWav.size(), &tensor)); /* Wrap the tensor with a std::vector for ease. */ - int8_t * tensorData = tflite::GetTensorData<int8_t>(&tensor); + auto* tensorData = tflite::GetTensorData<int8_t>(&tensor); std::vector <int8_t> vecResults = std::vector<int8_t>(tensorData, tensorData + tensor.bytes); |