From e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Thu, 14 Oct 2021 12:35:58 +0100 Subject: 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 Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13 --- test/1.1/Mean.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'test/1.1/Mean.cpp') diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index c7c5a9b5..34c29bad 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -1,14 +1,12 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "../DriverTestHelpers.hpp" #include "../TestTensor.hpp" -#include "../1.1/HalPolicy.hpp" - -#include +#include <1.1/HalPolicy.hpp> #include @@ -86,21 +84,22 @@ void MeanTestImpl(const TestTensor& input, if (preparedModel.get() != nullptr) { V1_0::ErrorStatus execStatus = Execute(preparedModel, request); - CHECK((int)execStatus == (int)V1_0::ErrorStatus::NONE); + DOCTEST_CHECK((int)execStatus == (int)V1_0::ErrorStatus::NONE); } const float* expectedOutputData = expectedOutput.GetData(); for (unsigned int i = 0; i < expectedOutput.GetNumElements(); i++) { - CHECK(outputData[i] == expectedOutputData[i]); + DOCTEST_CHECK(outputData[i] == expectedOutputData[i]); } } } // anonymous namespace -TEST_SUITE("MeanTests_CpuRef") +DOCTEST_TEST_SUITE("MeanTests_CpuRef") { - TEST_CASE("MeanNoKeepDimsTest_CpuRef") + + DOCTEST_TEST_CASE("MeanNoKeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -114,7 +113,7 @@ TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuRef); } - TEST_CASE("MeanKeepDimsTest_CpuRef") + DOCTEST_TEST_CASE("MeanKeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -125,7 +124,7 @@ TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuRef); } - TEST_CASE("MeanFp16NoKeepDimsTest_CpuRef") + DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -139,7 +138,7 @@ TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::CpuRef); } - TEST_CASE("MeanFp16KeepDimsTest_CpuRef") + DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -149,12 +148,13 @@ TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::CpuRef); } + } #ifdef ARMCOMPUTECL_ENABLED -TEST_SUITE("MeanTests_CpuAcc") +DOCTEST_TEST_SUITE("MeanTests_CpuAcc") { - TEST_CASE("MeanNoKeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanNoKeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -168,7 +168,7 @@ TEST_SUITE("MeanTests_CpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuAcc); } - TEST_CASE("MeanKeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanKeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -179,7 +179,7 @@ TEST_SUITE("MeanTests_CpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuAcc); } - TEST_CASE("MeanFp16NoKeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -193,7 +193,7 @@ TEST_SUITE("MeanTests_CpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::CpuAcc); } - TEST_CASE("MeanFp16KeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -205,9 +205,9 @@ TEST_SUITE("MeanTests_CpuAcc") } } -TEST_SUITE("MeanTests_GpuAcc") +DOCTEST_TEST_SUITE("MeanTests_GpuAcc") { - TEST_CASE("MeanNoKeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanNoKeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -221,7 +221,7 @@ TEST_SUITE("MeanTests_GpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::GpuAcc); } - TEST_CASE("MeanKeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanKeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -232,7 +232,7 @@ TEST_SUITE("MeanTests_GpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::GpuAcc); } - TEST_CASE("MeanFp16NoKeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -246,7 +246,7 @@ TEST_SUITE("MeanTests_GpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::GpuAcc); } - TEST_CASE("MeanFp16KeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; -- cgit v1.2.1