diff options
Diffstat (limited to 'src/backends/cl')
-rw-r--r-- | src/backends/cl/ClBackend.cpp | 8 | ||||
-rw-r--r-- | src/backends/cl/ClContextControl.cpp | 1 | ||||
-rw-r--r-- | src/backends/cl/ClTensorHandle.hpp | 6 | ||||
-rw-r--r-- | src/backends/cl/test/ClWorkloadFactoryHelper.hpp | 5 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClConcatWorkload.cpp | 10 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClDepthToSpaceWorkload.cpp | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClDequantizeWorkload.cpp | 7 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp | 7 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClSplitterWorkload.cpp | 5 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClStackWorkload.cpp | 6 |
10 files changed, 29 insertions, 32 deletions
diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index f662754693..0a898ec2c0 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -17,12 +17,12 @@ #include <armnn/backends/IBackendContext.hpp> #include <armnn/backends/IMemoryManager.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> + #include <Optimizer.hpp> #include <arm_compute/runtime/CL/CLBufferAllocator.h> -#include <boost/polymorphic_pointer_cast.hpp> - namespace armnn { @@ -41,7 +41,7 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( const IBackendInternal::IMemoryManagerSharedPtr& memoryManager) const { return std::make_unique<ClWorkloadFactory>( - boost::polymorphic_pointer_downcast<ClMemoryManager>(memoryManager)); + PolymorphicPointerDowncast<ClMemoryManager>(memoryManager)); } IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( @@ -52,7 +52,7 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( registry.RegisterMemoryManager(memoryManager); return std::make_unique<ClWorkloadFactory>( - boost::polymorphic_pointer_downcast<ClMemoryManager>(memoryManager)); + PolymorphicPointerDowncast<ClMemoryManager>(memoryManager)); } std::vector<ITensorHandleFactory::FactoryId> ClBackend::GetHandleFactoryPreferences() const diff --git a/src/backends/cl/ClContextControl.cpp b/src/backends/cl/ClContextControl.cpp index dbcccce945..40357d5706 100644 --- a/src/backends/cl/ClContextControl.cpp +++ b/src/backends/cl/ClContextControl.cpp @@ -16,7 +16,6 @@ #include <arm_compute/runtime/CL/CLScheduler.h> #include <boost/format.hpp> -#include <boost/polymorphic_cast.hpp> namespace cl { diff --git a/src/backends/cl/ClTensorHandle.hpp b/src/backends/cl/ClTensorHandle.hpp index 1830d186b6..0481307972 100644 --- a/src/backends/cl/ClTensorHandle.hpp +++ b/src/backends/cl/ClTensorHandle.hpp @@ -9,6 +9,8 @@ #include <Half.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> + #include <arm_compute/runtime/CL/CLTensor.h> #include <arm_compute/runtime/CL/CLSubTensor.h> #include <arm_compute/runtime/IMemoryGroup.h> @@ -16,8 +18,6 @@ #include <arm_compute/core/TensorShape.h> #include <arm_compute/core/Coordinates.h> -#include <boost/polymorphic_pointer_cast.hpp> - namespace armnn { @@ -71,7 +71,7 @@ public: virtual void SetMemoryGroup(const std::shared_ptr<arm_compute::IMemoryGroup>& memoryGroup) override { - m_MemoryGroup = boost::polymorphic_pointer_downcast<arm_compute::MemoryGroup>(memoryGroup); + m_MemoryGroup = PolymorphicPointerDowncast<arm_compute::MemoryGroup>(memoryGroup); } TensorShape GetStrides() const override diff --git a/src/backends/cl/test/ClWorkloadFactoryHelper.hpp b/src/backends/cl/test/ClWorkloadFactoryHelper.hpp index 1dfba7573b..6ea2f119da 100644 --- a/src/backends/cl/test/ClWorkloadFactoryHelper.hpp +++ b/src/backends/cl/test/ClWorkloadFactoryHelper.hpp @@ -7,13 +7,12 @@ #include <armnn/backends/IBackendInternal.hpp> #include <armnn/backends/IMemoryManager.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/test/WorkloadFactoryHelper.hpp> #include <cl/ClBackend.hpp> #include <cl/ClWorkloadFactory.hpp> -#include <boost/polymorphic_pointer_cast.hpp> - namespace { @@ -29,7 +28,7 @@ struct WorkloadFactoryHelper<armnn::ClWorkloadFactory> static armnn::ClWorkloadFactory GetFactory( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return armnn::ClWorkloadFactory(boost::polymorphic_pointer_downcast<armnn::ClMemoryManager>(memoryManager)); + return armnn::ClWorkloadFactory(armnn::PolymorphicPointerDowncast<armnn::ClMemoryManager>(memoryManager)); } }; diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index 5370466163..e0aebd30cb 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -5,6 +5,7 @@ #include "ClConcatWorkload.hpp" #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> @@ -12,8 +13,6 @@ #include <arm_compute/core/Types.h> #include <arm_compute/runtime/CL/functions/CLConcatenateLayer.h> -#include <boost/polymorphic_pointer_cast.hpp> - namespace armnn { using namespace armcomputetensorutils; @@ -72,11 +71,12 @@ ClConcatWorkload::ClConcatWorkload(const ConcatQueueDescriptor& descriptor, cons std::vector<arm_compute::ICLTensor *> aclInputs; for (auto input : m_Data.m_Inputs) { - arm_compute::ICLTensor& aclInput = boost::polymorphic_pointer_downcast<IClTensorHandle>(input)->GetTensor(); + arm_compute::ICLTensor& aclInput = armnn::PolymorphicPointerDowncast<IClTensorHandle>(input)->GetTensor(); aclInputs.emplace_back(&aclInput); } - arm_compute::ICLTensor& output = boost::polymorphic_pointer_downcast<IClTensorHandle>( - m_Data.m_Outputs[0])->GetTensor(); + + arm_compute::ICLTensor& output = + armnn::PolymorphicPointerDowncast<IClTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); // Create the layer function auto layer = std::make_unique<arm_compute::CLConcatenateLayer>(); diff --git a/src/backends/cl/workloads/ClDepthToSpaceWorkload.cpp b/src/backends/cl/workloads/ClDepthToSpaceWorkload.cpp index 800a98409e..04885b18aa 100644 --- a/src/backends/cl/workloads/ClDepthToSpaceWorkload.cpp +++ b/src/backends/cl/workloads/ClDepthToSpaceWorkload.cpp @@ -8,11 +8,11 @@ #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <cl/ClTensorHandle.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <boost/polymorphic_pointer_cast.hpp> namespace armnn { @@ -45,13 +45,13 @@ ClDepthToSpaceWorkload::ClDepthToSpaceWorkload(const DepthToSpaceQueueDescriptor arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); arm_compute::ICLTensor& input = - boost::polymorphic_pointer_downcast<IClTensorHandle>(m_Data.m_Inputs[0])->GetTensor(); + PolymorphicPointerDowncast<IClTensorHandle>(m_Data.m_Inputs[0])->GetTensor(); input.info()->set_data_layout(aclDataLayout); int32_t blockSize = boost::numeric_cast<int32_t>(desc.m_Parameters.m_BlockSize); arm_compute::ICLTensor& output = - boost::polymorphic_pointer_downcast<IClTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); + PolymorphicPointerDowncast<IClTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); output.info()->set_data_layout(aclDataLayout); m_Layer.configure(&input, &output, blockSize); diff --git a/src/backends/cl/workloads/ClDequantizeWorkload.cpp b/src/backends/cl/workloads/ClDequantizeWorkload.cpp index eca795de7e..eb63900380 100644 --- a/src/backends/cl/workloads/ClDequantizeWorkload.cpp +++ b/src/backends/cl/workloads/ClDequantizeWorkload.cpp @@ -7,6 +7,7 @@ #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <arm_compute/core/Types.h> @@ -14,8 +15,6 @@ #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> -#include <boost/polymorphic_pointer_cast.hpp> - namespace armnn { using namespace armcomputetensorutils; @@ -34,10 +33,10 @@ ClDequantizeWorkload::ClDequantizeWorkload(const DequantizeQueueDescriptor& desc { m_Data.ValidateInputsOutputs("ClDequantizeWorkload", 1, 1); - arm_compute::ICLTensor& input = boost::polymorphic_pointer_downcast<IClTensorHandle>( + arm_compute::ICLTensor& input = armnn::PolymorphicPointerDowncast<IClTensorHandle>( m_Data.m_Inputs[0])->GetTensor(); - arm_compute::ICLTensor& output = boost::polymorphic_pointer_downcast<IClTensorHandle>( + arm_compute::ICLTensor& output = armnn::PolymorphicPointerDowncast<IClTensorHandle>( m_Data.m_Outputs[0])->GetTensor(); m_Layer.reset(new arm_compute::CLDequantizationLayer()); diff --git a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp index 64da92c815..b87658b3f9 100644 --- a/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp +++ b/src/backends/cl/workloads/ClSpaceToBatchNdWorkload.cpp @@ -9,13 +9,12 @@ #include <aclCommon/ArmComputeUtils.hpp> #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> -#include <boost/polymorphic_pointer_cast.hpp> - namespace armnn { using namespace armcomputetensorutils; @@ -51,9 +50,9 @@ ClSpaceToBatchNdWorkload::ClSpaceToBatchNdWorkload( m_Data.ValidateInputsOutputs("ClSpaceToBatchNdWorkload", 1, 1); arm_compute::ICLTensor& input = - boost::polymorphic_pointer_downcast<IClTensorHandle>(m_Data.m_Inputs[0])->GetTensor(); + armnn::PolymorphicPointerDowncast<IClTensorHandle>(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ICLTensor& output = - boost::polymorphic_pointer_downcast<IClTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); + armnn::PolymorphicPointerDowncast<IClTensorHandle>(m_Data.m_Outputs[0])->GetTensor(); // ArmNN blockShape is [H, W] Cl asks for W, H int32_t blockHeight = boost::numeric_cast<int32_t>(m_Data.m_Parameters.m_BlockShape[0]); diff --git a/src/backends/cl/workloads/ClSplitterWorkload.cpp b/src/backends/cl/workloads/ClSplitterWorkload.cpp index 296e0a3dde..045fbb7595 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.cpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.cpp @@ -10,6 +10,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> #include <arm_compute/runtime/CL/functions/CLSplit.h> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <cl/ClTensorHandle.hpp> @@ -74,13 +75,13 @@ ClSplitterWorkload::ClSplitterWorkload(const SplitterQueueDescriptor& descriptor return; } - arm_compute::ICLTensor& input = boost::polymorphic_pointer_downcast<IClTensorHandle>( + arm_compute::ICLTensor& input = armnn::PolymorphicPointerDowncast<IClTensorHandle>( m_Data.m_Inputs[0])->GetTensor(); std::vector<arm_compute::ICLTensor *> aclOutputs; for (auto output : m_Data.m_Outputs) { - arm_compute::ICLTensor& aclOutput = boost::polymorphic_pointer_downcast<IClTensorHandle>(output)->GetTensor(); + arm_compute::ICLTensor& aclOutput = armnn::PolymorphicPointerDowncast<IClTensorHandle>(output)->GetTensor(); aclOutputs.emplace_back(&aclOutput); } diff --git a/src/backends/cl/workloads/ClStackWorkload.cpp b/src/backends/cl/workloads/ClStackWorkload.cpp index 3ba698ec4d..e434f9897f 100644 --- a/src/backends/cl/workloads/ClStackWorkload.cpp +++ b/src/backends/cl/workloads/ClStackWorkload.cpp @@ -5,6 +5,7 @@ #include "ClStackWorkload.hpp" #include "ClWorkloadUtils.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <backendsCommon/CpuTensorHandle.hpp> #include <cl/ClTensorHandle.hpp> #include <cl/ClLayerSupport.hpp> @@ -12,7 +13,6 @@ #include <arm_compute/core/Types.h> #include <boost/numeric/conversion/cast.hpp> -#include <boost/polymorphic_pointer_cast.hpp> namespace armnn { @@ -51,10 +51,10 @@ ClStackWorkload::ClStackWorkload(const StackQueueDescriptor& descriptor, const W std::vector<arm_compute::ICLTensor*> aclInputs; for (auto input : m_Data.m_Inputs) { - arm_compute::ICLTensor& aclInput = boost::polymorphic_pointer_downcast<IClTensorHandle>(input)->GetTensor(); + arm_compute::ICLTensor& aclInput = armnn::PolymorphicPointerDowncast<IClTensorHandle>(input)->GetTensor(); aclInputs.emplace_back(&aclInput); } - arm_compute::ICLTensor& output = boost::polymorphic_pointer_downcast<IClTensorHandle>( + arm_compute::ICLTensor& output = armnn::PolymorphicPointerDowncast<IClTensorHandle>( m_Data.m_Outputs[0])->GetTensor(); m_Layer.reset(new arm_compute::CLStackLayer()); |