From 5cf8e74e702e3d5278c898202cc25b04b812d87a Mon Sep 17 00:00:00 2001 From: Conor Kennedy Date: Mon, 13 Feb 2023 10:50:40 +0000 Subject: MLECO-2709: Inclusive language update * Update various files to use inclusive language Signed-off-by: Conor Kennedy Change-Id: I538f61a400e1d58acb6397bb5e2ba3d912196314 --- tests/use_case/asr/Wav2LetterPostprocessingTest.cc | 26 +++++++++++----------- tests/use_case/asr/Wav2LetterPreprocessingTest.cc | 4 ++-- .../kws_asr/Wav2LetterPostprocessingTest.cc | 26 +++++++++++----------- .../kws_asr/Wav2LetterPreprocessingTest.cc | 4 ++-- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/use_case/asr/Wav2LetterPostprocessingTest.cc b/tests/use_case/asr/Wav2LetterPostprocessingTest.cc index 513c084..bc711a6 100644 --- a/tests/use_case/asr/Wav2LetterPostprocessingTest.cc +++ b/tests/use_case/asr/Wav2LetterPostprocessingTest.cc @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates + * SPDX-FileCopyrightText: Copyright 2021-2023 Arm Limited and/or its affiliates * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -67,15 +67,15 @@ TEST_CASE("Checking return value") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; + std::vector placeholderLabels = {"a", "b", "$"}; const uint32_t blankTokenIdx = 2; - std::vector dummyResult; + std::vector placeholderResult; std::vector tensorShape = {1, 1, 1, 13}; std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; REQUIRE(!post.DoPostProcess()); @@ -90,15 +90,15 @@ TEST_CASE("Checking return value") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; + std::vector placeholderLabels = {"a", "b", "$"}; const uint32_t blankTokenIdx = 2; - std::vector dummyResult; + std::vector placeholderResult; std::vector tensorShape = {1, 1, 13, 1}; std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -124,14 +124,14 @@ TEST_CASE("Postprocessing - erasing required elements") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; - std::vector dummyResult; + std::vector placeholderLabels = {"a", "b", "$"}; + std::vector placeholderResult; SECTION("First and last iteration") { std::vector tensorVec; TfLiteTensor tensor = GetTestTensor(tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -148,7 +148,7 @@ TEST_CASE("Postprocessing - erasing required elements") std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -186,7 +186,7 @@ TEST_CASE("Postprocessing - erasing required elements") std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -229,7 +229,7 @@ TEST_CASE("Postprocessing - erasing required elements") tensorShape, 100, tensorVec); /* Should not be able to erase the left context if it is the first iteration. */ - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ diff --git a/tests/use_case/asr/Wav2LetterPreprocessingTest.cc b/tests/use_case/asr/Wav2LetterPreprocessingTest.cc index 5986616..273476e 100644 --- a/tests/use_case/asr/Wav2LetterPreprocessingTest.cc +++ b/tests/use_case/asr/Wav2LetterPreprocessingTest.cc @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates + * SPDX-FileCopyrightText: Copyright 2021-2023 Arm Limited and/or its affiliates * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -99,7 +99,7 @@ TEST_CASE("Preprocessing calculation INT8") (mfccWindowLen - mfccWindowStride) ); - /* Populate with dummy input. */ + /* Populate with placeholder input. */ PopulateTestWavVector(testWav); /* Allocate mem for tensor. */ diff --git a/tests/use_case/kws_asr/Wav2LetterPostprocessingTest.cc b/tests/use_case/kws_asr/Wav2LetterPostprocessingTest.cc index b343625..d19e0c4 100644 --- a/tests/use_case/kws_asr/Wav2LetterPostprocessingTest.cc +++ b/tests/use_case/kws_asr/Wav2LetterPostprocessingTest.cc @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates + * SPDX-FileCopyrightText: Copyright 2021-2023 Arm Limited and/or its affiliates * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -71,15 +71,15 @@ TEST_CASE("Checking return value") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; + std::vector placeholderLabels = {"a", "b", "$"}; const uint32_t blankTokenIdx = 2; - std::vector dummyResult; + std::vector placeholderResult; std::vector tensorShape = {1, 1, 1, 13}; std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; REQUIRE(!post.DoPostProcess()); @@ -94,15 +94,15 @@ TEST_CASE("Checking return value") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; + std::vector placeholderLabels = {"a", "b", "$"}; const uint32_t blankTokenIdx = 2; - std::vector dummyResult; + std::vector placeholderResult; std::vector tensorShape = {1, 1, 13, 1}; std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -128,14 +128,14 @@ TEST_CASE("Postprocessing - erasing required elements") sizeof(arm::app::tensorArena), arm::app::asr::GetModelPointer(), arm::app::asr::GetModelLen()); - std::vector dummyLabels = {"a", "b", "$"}; - std::vector dummyResult; + std::vector placeholderLabels = {"a", "b", "$"}; + std::vector placeholderResult; SECTION("First and last iteration") { std::vector tensorVec; TfLiteTensor tensor = GetTestTensor(tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -152,7 +152,7 @@ TEST_CASE("Postprocessing - erasing required elements") std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -189,7 +189,7 @@ TEST_CASE("Postprocessing - erasing required elements") std::vector tensorVec; TfLiteTensor tensor = GetTestTensor( tensorShape, 100, tensorVec); - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ @@ -232,7 +232,7 @@ TEST_CASE("Postprocessing - erasing required elements") tensorShape, 100, tensorVec); /* Should not be able to erase the left context if it is the first iteration. */ - arm::app::AsrPostProcess post{&tensor, classifier, dummyLabels, dummyResult, outputCtxLen, + arm::app::AsrPostProcess post{&tensor, classifier, placeholderLabels, placeholderResult, outputCtxLen, blankTokenIdx, arm::app::Wav2LetterModel::ms_outputRowsIdx}; /* Copy elements to compare later. */ diff --git a/tests/use_case/kws_asr/Wav2LetterPreprocessingTest.cc b/tests/use_case/kws_asr/Wav2LetterPreprocessingTest.cc index e6b336e..b86556a 100644 --- a/tests/use_case/kws_asr/Wav2LetterPreprocessingTest.cc +++ b/tests/use_case/kws_asr/Wav2LetterPreprocessingTest.cc @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates + * SPDX-FileCopyrightText: Copyright 2021-2023 Arm Limited and/or its affiliates * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -99,7 +99,7 @@ TEST_CASE("Preprocessing calculation INT8") (mfccWindowLen - mfccWindowStride) ); - /* Populate with dummy input. */ + /* Populate with placeholder input. */ PopulateTestWavVector(testWav); /* Allocate mem for tensor. */ -- cgit v1.2.1