From bb446e576e120512d5752a5d6dc1ddc636f563ba Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Thu, 2 Apr 2020 13:56:54 +0100 Subject: IVGCVSW-4483 Remove boost::polymorphic_downcast * exchange boost::polymorphic_downcast with armnn::PolymorphicDowncast * remove unnecessary includes of boost::polymorphic_downcast Signed-off-by: Jan Eilers Change-Id: Ie603fb82860fe05fee547dc78073230cc62b2e1f --- .../reference/test/RefCreateWorkloadTests.cpp | 27 +++++++++++----------- .../reference/workloads/RefWorkloadUtils.hpp | 4 ++-- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/backends/reference') diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index b83d205970..29bfbc0ee2 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -16,8 +17,8 @@ template void CheckInputOutput(std::unique_ptr workload, const TensorInfo& inputInfo, const TensorInfo& outputInfo) { auto queueDescriptor = workload->GetData(); - auto inputHandle = boost::polymorphic_downcast(queueDescriptor.m_Inputs[0]); - auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto inputHandle = PolymorphicDowncast(queueDescriptor.m_Inputs[0]); + auto outputHandle = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((inputHandle->GetTensorInfo() == inputInfo)); BOOST_TEST((outputHandle->GetTensorInfo() == outputInfo)); } @@ -29,9 +30,9 @@ void CheckInputsOutput(std::unique_ptr workload, const TensorInfo& outputInfo) { auto queueDescriptor = workload->GetData(); - auto inputHandle0 = boost::polymorphic_downcast(queueDescriptor.m_Inputs[0]); - auto inputHandle1 = boost::polymorphic_downcast(queueDescriptor.m_Inputs[1]); - auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto inputHandle0 = PolymorphicDowncast(queueDescriptor.m_Inputs[0]); + auto inputHandle1 = PolymorphicDowncast(queueDescriptor.m_Inputs[1]); + auto outputHandle = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((inputHandle0->GetTensorInfo() == inputInfo0)); BOOST_TEST((inputHandle1->GetTensorInfo() == inputInfo1)); BOOST_TEST((outputHandle->GetTensorInfo() == outputInfo)); @@ -538,16 +539,16 @@ static void RefCreateSplitterWorkloadTest() // Checks that outputs are as we expect them (see definition of CreateSplitterWorkloadTest). SplitterQueueDescriptor queueDescriptor = workload->GetData(); - auto inputHandle = boost::polymorphic_downcast(queueDescriptor.m_Inputs[0]); + auto inputHandle = PolymorphicDowncast(queueDescriptor.m_Inputs[0]); BOOST_TEST((inputHandle->GetTensorInfo() == TensorInfo({ 5, 7, 7 }, DataType))); - auto outputHandle0 = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto outputHandle0 = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((outputHandle0->GetTensorInfo() == TensorInfo({ 1, 7, 7 }, DataType))); - auto outputHandle1 = boost::polymorphic_downcast(queueDescriptor.m_Outputs[1]); + auto outputHandle1 = PolymorphicDowncast(queueDescriptor.m_Outputs[1]); BOOST_TEST((outputHandle1->GetTensorInfo() == TensorInfo({ 2, 7, 7 }, DataType))); - auto outputHandle2 = boost::polymorphic_downcast(queueDescriptor.m_Outputs[2]); + auto outputHandle2 = PolymorphicDowncast(queueDescriptor.m_Outputs[2]); BOOST_TEST((outputHandle2->GetTensorInfo() == TensorInfo({ 2, 7, 7 }, DataType))); } @@ -910,7 +911,7 @@ static void RefCreateConstantWorkloadTest(const armnn::TensorShape& outputShape) // Check output is as expected auto queueDescriptor = workload->GetData(); - auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto outputHandle = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((outputHandle->GetTensorInfo() == TensorInfo(outputShape, DataType))); } @@ -950,7 +951,7 @@ static void RefCreatePreluWorkloadTest(const armnn::TensorShape& inputShape, // Check output is as expected auto queueDescriptor = workload->GetData(); - auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto outputHandle = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((outputHandle->GetTensorInfo() == TensorInfo(outputShape, dataType))); } @@ -1054,10 +1055,10 @@ static void RefCreateStackWorkloadTest(const armnn::TensorShape& inputShape, StackQueueDescriptor queueDescriptor = workload->GetData(); for (unsigned int i = 0; i < numInputs; ++i) { - auto inputHandle = boost::polymorphic_downcast(queueDescriptor.m_Inputs[i]); + auto inputHandle = PolymorphicDowncast(queueDescriptor.m_Inputs[i]); BOOST_TEST((inputHandle->GetTensorInfo() == TensorInfo(inputShape, DataType))); } - auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + auto outputHandle = PolymorphicDowncast(queueDescriptor.m_Outputs[0]); BOOST_TEST((outputHandle->GetTensorInfo() == TensorInfo(outputShape, DataType))); } diff --git a/src/backends/reference/workloads/RefWorkloadUtils.hpp b/src/backends/reference/workloads/RefWorkloadUtils.hpp index f1b31571db..a36ed45970 100644 --- a/src/backends/reference/workloads/RefWorkloadUtils.hpp +++ b/src/backends/reference/workloads/RefWorkloadUtils.hpp @@ -9,12 +9,12 @@ #include #include +#include #include #include #include -#include namespace armnn { @@ -27,7 +27,7 @@ inline const TensorInfo& GetTensorInfo(const ITensorHandle* tensorHandle) { // We know that reference workloads use RefTensorHandles for inputs and outputs const RefTensorHandle* refTensorHandle = - boost::polymorphic_downcast(tensorHandle); + PolymorphicDowncast(tensorHandle); return refTensorHandle->GetTensorInfo(); } -- cgit v1.2.1