diff options
author | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
---|---|---|
committer | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
commit | e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b (patch) | |
tree | 79d9178420924d57ed0ab23db46ff57159279886 /test/1.3/QLstm.cpp | |
parent | 4bd8f7c96e01e081276c376fe5c34018e7b70d17 (diff) | |
download | android-nn-driver-e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b.tar.gz |
IVGCVSW-6428 Remove asserts
* Changed asserts to check for errors and return appropriate values or
throw exceptions
* Changed unit tests to use Doctest's long macro names as the short
macro names clashed with Android's Logging macros
* Removed unused #includes
* Clarified ambiguous #includes
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13
Diffstat (limited to 'test/1.3/QLstm.cpp')
-rw-r--r-- | test/1.3/QLstm.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/1.3/QLstm.cpp b/test/1.3/QLstm.cpp index 82acba6e..08466195 100644 --- a/test/1.3/QLstm.cpp +++ b/test/1.3/QLstm.cpp @@ -1,16 +1,11 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "../DriverTestHelpers.hpp" -#include "../TestTensor.hpp" -#include "../1.3/HalPolicy.hpp" - -#include <armnn/utility/IgnoreUnused.hpp> - -#include <doctest/doctest.h> +#include <1.3/HalPolicy.hpp> #include <array> @@ -499,8 +494,9 @@ void QLstmTestImpl(const hidl_vec<uint32_t>& inputDimensions, // check the results for (size_t i = 0; i < outputStateOutValue.size(); ++i) { - CHECK_MESSAGE(outputStateOutValue[i] == doctest::Approx( outputStateOutData[i] ).epsilon(TOLERANCE), - "outputStateOut[" << i << "]: " << outputStateOutValue[i] << " != " << outputStateOutData[i]); + DOCTEST_CHECK_MESSAGE(outputStateOutValue[i] == doctest::Approx( outputStateOutData[i] ).epsilon(TOLERANCE), + "outputStateOut[" << i << "]: " << outputStateOutValue[i] << " != " + << outputStateOutData[i]); } // CELL STATE OUTPUT Does not match currently: IVGCVSW-4860 Verify remaining VTS tests (2) for QLSTM @@ -513,8 +509,8 @@ void QLstmTestImpl(const hidl_vec<uint32_t>& inputDimensions, for (size_t i = 0; i < outputValue.size(); ++i) { - CHECK_MESSAGE(outputValue[i] == doctest::Approx( outputData[i] ).epsilon(TOLERANCE), - "output[" << i << "]: " << outputValue[i] << " != " << outputData[i]); + DOCTEST_CHECK_MESSAGE(outputValue[i] == doctest::Approx( outputData[i] ).epsilon(TOLERANCE), + "output[" << i << "]: " << outputValue[i] << " != " << outputData[i]); } } @@ -1005,29 +1001,33 @@ void DynamicOutputQLstmWithNoProjection(armnn::Compute compute) // QLstmWithProjection(sample); //} -TEST_SUITE("QLSTMTests_CpuRef") +DOCTEST_TEST_SUITE("QLSTMTests_CpuRef") { - TEST_CASE("QLSTMWithNoProjectionTest_CpuRef") + + DOCTEST_TEST_CASE("QLSTMWithNoProjectionTest_CpuRef") { QLstmWithNoProjection(armnn::Compute::CpuRef); } - TEST_CASE("DynamicOutputQLstmWithNoProjection_CpuRef") + DOCTEST_TEST_CASE("DynamicOutputQLstmWithNoProjection_CpuRef") { DynamicOutputQLstmWithNoProjection(armnn::Compute::CpuRef); } + } #ifdef ARMCOMPUTECL_ENABLED -TEST_SUITE("QLSTMTests_CpuAcc") +DOCTEST_TEST_SUITE("QLSTMTests_CpuAcc") { - TEST_CASE("QLSTMWithNoProjectionTest_CpuAcc") + + DOCTEST_TEST_CASE("QLSTMWithNoProjectionTest_CpuAcc") { QLstmWithNoProjection(armnn::Compute::CpuAcc); } - TEST_CASE("DynamicOutputQLstmWithNoProjection_CpuAcc") + DOCTEST_TEST_CASE("DynamicOutputQLstmWithNoProjection_CpuAcc") { DynamicOutputQLstmWithNoProjection(armnn::Compute::CpuAcc); } + } #endif |