From 3c9e04563b9fb7d7aadc61834909a9ffc6b1769c Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Fri, 10 Apr 2020 13:00:44 +0100 Subject: IVGCVSW-4483 Removes boost::polymorphic_pointer_downcast * replace boost::polymorphic_pointer_downcast by PolymorphicPointerDowncast * replaced/removed includes Signed-off-by: Jan Eilers Change-Id: I0ef934a3804cf05e4c38dec6c4ec49c76111a302 --- src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.cpp | 6 ++++-- src/backends/neon/workloads/NeonComparisonWorkload.cpp | 7 ++++--- src/backends/neon/workloads/NeonConcatWorkload.cpp | 7 +++---- src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp | 6 +++--- src/backends/neon/workloads/NeonQuantizeWorkload.cpp | 7 +++---- src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.cpp | 6 ++++-- src/backends/neon/workloads/NeonSplitterWorkload.cpp | 2 +- src/backends/neon/workloads/NeonStackWorkload.cpp | 6 +++--- 8 files changed, 25 insertions(+), 22 deletions(-) (limited to 'src/backends/neon/workloads') diff --git a/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.cpp b/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.cpp index a6e7aa4415..d2f538745c 100644 --- a/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.cpp +++ b/src/backends/neon/workloads/NeonBatchToSpaceNdWorkload.cpp @@ -6,6 +6,8 @@ #include "NeonBatchToSpaceNdWorkload.hpp" #include "NeonWorkloadUtils.hpp" + +#include #include namespace armnn @@ -38,9 +40,9 @@ NeonBatchToSpaceNdWorkload::NeonBatchToSpaceNdWorkload(const BatchToSpaceNdQueue m_Data.ValidateInputsOutputs("NeonBatchToSpaceNdWorkload", 1, 1); arm_compute::ITensor& input = - boost::polymorphic_pointer_downcast(m_Data.m_Inputs[0])->GetTensor(); + armnn::PolymorphicPointerDowncast(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ITensor& output = - boost::polymorphic_pointer_downcast(m_Data.m_Outputs[0])->GetTensor(); + armnn::PolymorphicPointerDowncast(m_Data.m_Outputs[0])->GetTensor(); arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); input.info()->set_data_layout(aclDataLayout); diff --git a/src/backends/neon/workloads/NeonComparisonWorkload.cpp b/src/backends/neon/workloads/NeonComparisonWorkload.cpp index 0edb3328b9..6e1f208228 100644 --- a/src/backends/neon/workloads/NeonComparisonWorkload.cpp +++ b/src/backends/neon/workloads/NeonComparisonWorkload.cpp @@ -6,6 +6,7 @@ #include "NeonComparisonWorkload.hpp" #include #include +#include #include namespace armnn @@ -35,9 +36,9 @@ NeonComparisonWorkload::NeonComparisonWorkload(const ComparisonQueueDescriptor& { m_Data.ValidateInputsOutputs("NeonComparisonWorkload", 2, 1); - arm_compute::ITensor& input0 = boost::polymorphic_downcast(m_Data.m_Inputs[0])->GetTensor(); - arm_compute::ITensor& input1 = boost::polymorphic_downcast(m_Data.m_Inputs[1])->GetTensor(); - arm_compute::ITensor& output = boost::polymorphic_downcast(m_Data.m_Outputs[0])->GetTensor(); + arm_compute::ITensor& input0 = PolymorphicDowncast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& input1 = PolymorphicDowncast(m_Data.m_Inputs[1])->GetTensor(); + arm_compute::ITensor& output = PolymorphicDowncast(m_Data.m_Outputs[0])->GetTensor(); const arm_compute::ComparisonOperation comparisonOperation = ConvertComparisonOperationToAcl(m_Data.m_Parameters); diff --git a/src/backends/neon/workloads/NeonConcatWorkload.cpp b/src/backends/neon/workloads/NeonConcatWorkload.cpp index 4a9f68798c..65678aae59 100644 --- a/src/backends/neon/workloads/NeonConcatWorkload.cpp +++ b/src/backends/neon/workloads/NeonConcatWorkload.cpp @@ -8,11 +8,10 @@ #include "NeonWorkloadUtils.hpp" #include +#include #include #include - - namespace armnn { using namespace armcomputetensorutils; @@ -73,10 +72,10 @@ const ConcatQueueDescriptor& descriptor, const WorkloadInfo& info) std::vector aclInputs; for (auto input : m_Data.m_Inputs) { - arm_compute::ITensor& aclInput = boost::polymorphic_pointer_downcast(input)->GetTensor(); + arm_compute::ITensor& aclInput = armnn::PolymorphicPointerDowncast(input)->GetTensor(); aclInputs.emplace_back(&aclInput); } - arm_compute::ITensor& output = boost::polymorphic_pointer_downcast( + arm_compute::ITensor& output = armnn::PolymorphicPointerDowncast( m_Data.m_Outputs[0])->GetTensor(); // Create the layer function diff --git a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp index b30dfcd80e..12e7d206bf 100644 --- a/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthToSpaceWorkload.cpp @@ -8,9 +8,9 @@ #include "NeonWorkloadUtils.hpp" #include +#include #include -#include namespace armnn { @@ -39,13 +39,13 @@ NeonDepthToSpaceWorkload::NeonDepthToSpaceWorkload(const DepthToSpaceQueueDescri arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); arm_compute::ITensor& input = - boost::polymorphic_pointer_downcast(m_Data.m_Inputs[0])->GetTensor(); + PolymorphicPointerDowncast(m_Data.m_Inputs[0])->GetTensor(); input.info()->set_data_layout(aclDataLayout); int32_t blockSize = boost::numeric_cast(desc.m_Parameters.m_BlockSize); arm_compute::ITensor& output = - boost::polymorphic_pointer_downcast(m_Data.m_Outputs[0])->GetTensor(); + PolymorphicPointerDowncast(m_Data.m_Outputs[0])->GetTensor(); output.info()->set_data_layout(aclDataLayout); m_Layer.configure(&input, &output, blockSize); diff --git a/src/backends/neon/workloads/NeonQuantizeWorkload.cpp b/src/backends/neon/workloads/NeonQuantizeWorkload.cpp index 4f3ea2c3c1..14fbdf3dd9 100644 --- a/src/backends/neon/workloads/NeonQuantizeWorkload.cpp +++ b/src/backends/neon/workloads/NeonQuantizeWorkload.cpp @@ -8,10 +8,9 @@ #include #include +#include #include -#include - namespace armnn { using namespace armcomputetensorutils; @@ -30,9 +29,9 @@ NeonQuantizeWorkload::NeonQuantizeWorkload(const QuantizeQueueDescriptor& descri { m_Data.ValidateInputsOutputs("NeonQuantizeWorkload", 1, 1); - arm_compute::ITensor& input = boost::polymorphic_pointer_downcast( + arm_compute::ITensor& input = PolymorphicPointerDowncast( m_Data.m_Inputs[0])->GetTensor(); - arm_compute::ITensor& output = boost::polymorphic_pointer_downcast( + arm_compute::ITensor& output = PolymorphicPointerDowncast( m_Data.m_Outputs[0])->GetTensor(); m_Layer.reset(new arm_compute::NEQuantizationLayer()); diff --git a/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.cpp b/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.cpp index 199e926142..d68ab4c4ac 100644 --- a/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.cpp +++ b/src/backends/neon/workloads/NeonSpaceToBatchNdWorkload.cpp @@ -6,6 +6,8 @@ #include "NeonSpaceToBatchNdWorkload.hpp" #include "NeonWorkloadUtils.hpp" + +#include #include namespace armnn @@ -44,9 +46,9 @@ NeonSpaceToBatchNdWorkload::NeonSpaceToBatchNdWorkload(const SpaceToBatchNdQueue m_Data.ValidateInputsOutputs("NESpaceToBatchNdWorkload", 1, 1); arm_compute::ITensor& input = - boost::polymorphic_pointer_downcast(m_Data.m_Inputs[0])->GetTensor(); + PolymorphicPointerDowncast(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ITensor& output = - boost::polymorphic_pointer_downcast(m_Data.m_Outputs[0])->GetTensor(); + PolymorphicPointerDowncast(m_Data.m_Outputs[0])->GetTensor(); // ArmNN blockShape is [H, W] Cl asks for W, H int32_t blockHeight = boost::numeric_cast(m_Data.m_Parameters.m_BlockShape[0]); diff --git a/src/backends/neon/workloads/NeonSplitterWorkload.cpp b/src/backends/neon/workloads/NeonSplitterWorkload.cpp index 19fa7c6389..de6f1378bd 100644 --- a/src/backends/neon/workloads/NeonSplitterWorkload.cpp +++ b/src/backends/neon/workloads/NeonSplitterWorkload.cpp @@ -80,7 +80,7 @@ NeonSplitterWorkload::NeonSplitterWorkload(const SplitterQueueDescriptor& descri std::vector aclOutputs; for (auto output : m_Data.m_Outputs) { - arm_compute::ITensor& aclOutput = boost::polymorphic_pointer_downcast(output)->GetTensor(); + arm_compute::ITensor& aclOutput = PolymorphicPointerDowncast(output)->GetTensor(); aclOutputs.emplace_back(&aclOutput); } diff --git a/src/backends/neon/workloads/NeonStackWorkload.cpp b/src/backends/neon/workloads/NeonStackWorkload.cpp index b21494397d..a3ba8d888d 100644 --- a/src/backends/neon/workloads/NeonStackWorkload.cpp +++ b/src/backends/neon/workloads/NeonStackWorkload.cpp @@ -6,11 +6,11 @@ #include "NeonWorkloadUtils.hpp" #include +#include #include #include #include -#include namespace armnn { @@ -53,10 +53,10 @@ NeonStackWorkload::NeonStackWorkload(const StackQueueDescriptor& descriptor, con std::vector aclInputs; for (auto input : m_Data.m_Inputs) { - arm_compute::ITensor& aclInput = boost::polymorphic_pointer_downcast(input)->GetTensor(); + arm_compute::ITensor& aclInput = PolymorphicPointerDowncast(input)->GetTensor(); aclInputs.emplace_back(&aclInput); } - arm_compute::ITensor& output = boost::polymorphic_pointer_downcast( + arm_compute::ITensor& output = PolymorphicPointerDowncast( m_Data.m_Outputs[0])->GetTensor(); m_Layer.reset(new arm_compute::NEStackLayer()); -- cgit v1.2.1