diff options
author | Colm Donelan <Colm.Donelan@arm.com> | 2021-05-17 13:01:52 +0100 |
---|---|---|
committer | Colm Donelan <Colm.Donelan@arm.com> | 2021-05-18 11:25:13 +0100 |
commit | 25ab3a8326a9e2c52c84b2747fa72907109a695d (patch) | |
tree | 1d4eaaf5b41c68a4e3b3ce2cc400c3ffd76d510c /src/backends/neon | |
parent | 1d239f5717e6e4adc47683e30a48b05e7511c734 (diff) | |
download | armnn-25ab3a8326a9e2c52c84b2747fa72907109a695d.tar.gz |
IVGCVSW-5964 Removing some remaining boost utility usages from tests.
* Adding a basic PredicateResult class to replace
boost::test_tools::predicate_result
* Replacing all uses of boost::test_tools::predicate_result with
the new armnn::PredicateResult class
* Replacing use of boost::test_tools::output_test_stream output
with std::ostringstream in ProfilerTests.cpp
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I75cdbbff98d984e26e4a50c125386b2988516fad
Diffstat (limited to 'src/backends/neon')
-rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 20 | ||||
-rw-r--r-- | src/backends/neon/test/NeonMemCopyTests.cpp | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index c994bfe55a..a8c0c8aca0 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -23,8 +23,8 @@ BOOST_AUTO_TEST_SUITE(CreateWorkloadNeon) namespace { -boost::test_tools::predicate_result CompareIAclTensorHandleShape(IAclTensorHandle* tensorHandle, - std::initializer_list<unsigned int> expectedDimensions) +armnn::PredicateResult CompareIAclTensorHandleShape(IAclTensorHandle* tensorHandle, + std::initializer_list<unsigned int> expectedDimensions) { return CompareTensorHandleShape<IAclTensorHandle>(tensorHandle, expectedDimensions); } @@ -564,16 +564,20 @@ static void NeonCreateResizeWorkloadTest(DataLayout dataLayout) auto inputHandle = PolymorphicDowncast<IAclTensorHandle*>(queueDescriptor.m_Inputs[0]); auto outputHandle = PolymorphicDowncast<IAclTensorHandle*>(queueDescriptor.m_Outputs[0]); + armnn::PredicateResult predResult(true); switch (dataLayout) { case DataLayout::NHWC: - BOOST_TEST(CompareIAclTensorHandleShape(inputHandle, { 2, 4, 4, 3 })); - BOOST_TEST(CompareIAclTensorHandleShape(outputHandle, { 2, 2, 2, 3 })); + predResult = CompareIAclTensorHandleShape(inputHandle, { 2, 4, 4, 3 }); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); + predResult = CompareIAclTensorHandleShape(outputHandle, { 2, 2, 2, 3 }); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); break; - case DataLayout::NCHW: - default: - BOOST_TEST(CompareIAclTensorHandleShape(inputHandle, { 2, 3, 4, 4 })); - BOOST_TEST(CompareIAclTensorHandleShape(outputHandle, { 2, 3, 2, 2 })); + default: // DataLayout::NCHW + predResult = CompareIAclTensorHandleShape(inputHandle, { 2, 3, 4, 4 }); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); + predResult = CompareIAclTensorHandleShape(outputHandle, { 2, 3, 2, 2 }); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); } } diff --git a/src/backends/neon/test/NeonMemCopyTests.cpp b/src/backends/neon/test/NeonMemCopyTests.cpp index dbe1f8da3f..6a3d05d000 100644 --- a/src/backends/neon/test/NeonMemCopyTests.cpp +++ b/src/backends/neon/test/NeonMemCopyTests.cpp @@ -20,28 +20,32 @@ BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndNeon) { LayerTestResult<float, 4> result = MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(false); - BOOST_TEST(CompareTensors(result.output, result.outputExpected)); + auto predResult = CompareTensors(result.output, result.outputExpected); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); } BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndCpu) { LayerTestResult<float, 4> result = MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(false); - BOOST_TEST(CompareTensors(result.output, result.outputExpected)); + auto predResult = CompareTensors(result.output, result.outputExpected); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); } BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndNeonWithSubtensors) { LayerTestResult<float, 4> result = MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(true); - BOOST_TEST(CompareTensors(result.output, result.outputExpected)); + auto predResult = CompareTensors(result.output, result.outputExpected); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); } BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndCpuWithSubtensors) { LayerTestResult<float, 4> result = MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(true); - BOOST_TEST(CompareTensors(result.output, result.outputExpected)); + auto predResult = CompareTensors(result.output, result.outputExpected); + BOOST_TEST(predResult.m_Result, predResult.m_Message.str()); } BOOST_AUTO_TEST_SUITE_END() |