From 25ab3a8326a9e2c52c84b2747fa72907109a695d Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Mon, 17 May 2021 13:01:52 +0100 Subject: 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 Change-Id: I75cdbbff98d984e26e4a50c125386b2988516fad --- src/backends/neon/test/NeonCreateWorkloadTests.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/backends/neon/test/NeonCreateWorkloadTests.cpp') 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 expectedDimensions) +armnn::PredicateResult CompareIAclTensorHandleShape(IAclTensorHandle* tensorHandle, + std::initializer_list expectedDimensions) { return CompareTensorHandleShape(tensorHandle, expectedDimensions); } @@ -564,16 +564,20 @@ static void NeonCreateResizeWorkloadTest(DataLayout dataLayout) auto inputHandle = PolymorphicDowncast(queueDescriptor.m_Inputs[0]); auto outputHandle = PolymorphicDowncast(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()); } } -- cgit v1.2.1