diff options
Diffstat (limited to 'src/backends/cl/workloads')
32 files changed, 50 insertions, 43 deletions
diff --git a/src/backends/cl/workloads/ClActivationWorkload.hpp b/src/backends/cl/workloads/ClActivationWorkload.hpp index 4fdd4977a0..35166332e6 100644 --- a/src/backends/cl/workloads/ClActivationWorkload.hpp +++ b/src/backends/cl/workloads/ClActivationWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLActivationLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClAdditionWorkload.hpp b/src/backends/cl/workloads/ClAdditionWorkload.hpp index 7a0228d0c8..62bd0ae20b 100644 --- a/src/backends/cl/workloads/ClAdditionWorkload.hpp +++ b/src/backends/cl/workloads/ClAdditionWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp index cdd679bea2..e94bef20ac 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.hpp @@ -7,7 +7,8 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/CLTensor.h> +#include <arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp index 4db84a2787..881b294097 100644 --- a/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp +++ b/src/backends/cl/workloads/ClBatchToSpaceNdWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLBatchToSpaceLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClConcatWorkload.cpp b/src/backends/cl/workloads/ClConcatWorkload.cpp index fb28946549..5370466163 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.cpp +++ b/src/backends/cl/workloads/ClConcatWorkload.cpp @@ -10,6 +10,7 @@ #include <cl/ClLayerSupport.hpp> #include <arm_compute/core/Types.h> +#include <arm_compute/runtime/CL/functions/CLConcatenateLayer.h> #include <boost/polymorphic_pointer_cast.hpp> @@ -78,14 +79,15 @@ ClConcatWorkload::ClConcatWorkload(const ConcatQueueDescriptor& descriptor, cons m_Data.m_Outputs[0])->GetTensor(); // Create the layer function - m_Layer.reset(new arm_compute::CLConcatenateLayer()); + auto layer = std::make_unique<arm_compute::CLConcatenateLayer>(); // Configure input and output tensors size_t aclAxis = CalcAxis(descriptor.m_Parameters); - m_Layer->configure(aclInputs, &output, aclAxis); + layer->configure(aclInputs, &output, aclAxis); // Prepare - m_Layer->prepare(); + layer->prepare(); + m_Layer = std::move(layer); } void ClConcatWorkload::Execute() const @@ -97,4 +99,4 @@ void ClConcatWorkload::Execute() const } } -} //namespace armnn
\ No newline at end of file +} //namespace armnn diff --git a/src/backends/cl/workloads/ClConcatWorkload.hpp b/src/backends/cl/workloads/ClConcatWorkload.hpp index c34de9ff9a..772bc094ea 100644 --- a/src/backends/cl/workloads/ClConcatWorkload.hpp +++ b/src/backends/cl/workloads/ClConcatWorkload.hpp @@ -7,7 +7,8 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/core/Error.h> +#include <arm_compute/runtime/IFunction.h> namespace armnn { @@ -24,7 +25,7 @@ public: void Execute() const override; private: - mutable std::unique_ptr<arm_compute::CLConcatenateLayer> m_Layer; + mutable std::unique_ptr<arm_compute::IFunction> m_Layer; }; } //namespace armnn diff --git a/src/backends/cl/workloads/ClConstantWorkload.hpp b/src/backends/cl/workloads/ClConstantWorkload.hpp index 374831fcf8..75325dc409 100644 --- a/src/backends/cl/workloads/ClConstantWorkload.hpp +++ b/src/backends/cl/workloads/ClConstantWorkload.hpp @@ -7,8 +7,6 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> - namespace armnn { class ClConstantWorkload : public BaseWorkload<ConstantQueueDescriptor> diff --git a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp index e8c619d021..ef5c9b6497 100644 --- a/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp16ToFp32Workload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLDepthConvertLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp index b817156054..6e04e39425 100644 --- a/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp +++ b/src/backends/cl/workloads/ClConvertFp32ToFp16Workload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLDepthConvertLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp index 754e5b4d67..ddca87d78a 100644 --- a/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClDivisionFloatWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp index 376ca3ef02..1ddaddff0b 100644 --- a/src/backends/cl/workloads/ClFloorFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClFloorFloatWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLFloor.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp index af672c8e70..e13436eaa5 100644 --- a/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp +++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <memory> diff --git a/src/backends/cl/workloads/ClGreaterWorkload.hpp b/src/backends/cl/workloads/ClGreaterWorkload.hpp index 84a24fffa3..862e168334 100644 --- a/src/backends/cl/workloads/ClGreaterWorkload.hpp +++ b/src/backends/cl/workloads/ClGreaterWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLComparison.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp index 53bbfc82c9..26aea9fd88 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLL2NormalizeLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp index ae42d6ecc3..b7cb408b40 100644 --- a/src/backends/cl/workloads/ClLstmFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClLstmFloatWorkload.hpp @@ -10,7 +10,7 @@ #include <backendsCommon/Workload.hpp> #include <backendsCommon/WorkloadData.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLLSTMLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClMaximumWorkload.hpp b/src/backends/cl/workloads/ClMaximumWorkload.hpp index e8cc5ba787..18f67cddf6 100644 --- a/src/backends/cl/workloads/ClMaximumWorkload.hpp +++ b/src/backends/cl/workloads/ClMaximumWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> namespace armnn { @@ -26,4 +26,4 @@ private: mutable arm_compute::CLElementwiseMax m_MaximumLayer; }; -} //namespace armnn
\ No newline at end of file +} //namespace armnn diff --git a/src/backends/cl/workloads/ClMeanWorkload.hpp b/src/backends/cl/workloads/ClMeanWorkload.hpp index c46d18b0f9..127c0548b1 100644 --- a/src/backends/cl/workloads/ClMeanWorkload.hpp +++ b/src/backends/cl/workloads/ClMeanWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLReduceMean.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClMinimumWorkload.hpp b/src/backends/cl/workloads/ClMinimumWorkload.hpp index f1e8d122bc..55d7eea9dd 100644 --- a/src/backends/cl/workloads/ClMinimumWorkload.hpp +++ b/src/backends/cl/workloads/ClMinimumWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> namespace armnn { @@ -26,4 +26,4 @@ private: mutable arm_compute::CLElementwiseMin m_MinimumLayer; }; -} //namespace armnn
\ No newline at end of file +} //namespace armnn diff --git a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp index 2dd6bfe6df..732bb16dcc 100644 --- a/src/backends/cl/workloads/ClMultiplicationWorkload.hpp +++ b/src/backends/cl/workloads/ClMultiplicationWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp index 4789efcf5f..a6d4f25e5e 100644 --- a/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClNormalizationFloatWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLNormalizationLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClPooling2dWorkload.hpp b/src/backends/cl/workloads/ClPooling2dWorkload.hpp index 01c97539f0..ce67db2a13 100644 --- a/src/backends/cl/workloads/ClPooling2dWorkload.hpp +++ b/src/backends/cl/workloads/ClPooling2dWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLPoolingLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClPreluWorkload.hpp b/src/backends/cl/workloads/ClPreluWorkload.hpp index 6ffe4ca7c0..9061416431 100644 --- a/src/backends/cl/workloads/ClPreluWorkload.hpp +++ b/src/backends/cl/workloads/ClPreluWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLPReluLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClReshapeWorkload.hpp b/src/backends/cl/workloads/ClReshapeWorkload.hpp index 62f5fccec8..d836f1e43a 100644 --- a/src/backends/cl/workloads/ClReshapeWorkload.hpp +++ b/src/backends/cl/workloads/ClReshapeWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLReshapeLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClResizeWorkload.hpp b/src/backends/cl/workloads/ClResizeWorkload.hpp index 5a128fafda..ab5b943457 100644 --- a/src/backends/cl/workloads/ClResizeWorkload.hpp +++ b/src/backends/cl/workloads/ClResizeWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLScale.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp index 0da8ddad8d..7efdae858a 100644 --- a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp +++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> #include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <memory> diff --git a/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp index ea467341e4..f378b89a5d 100644 --- a/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp +++ b/src/backends/cl/workloads/ClSoftmaxUint8Workload.hpp @@ -7,8 +7,8 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> -#include "arm_compute/runtime/MemoryManagerOnDemand.h" +#include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> +#include <arm_compute/runtime/MemoryManagerOnDemand.h> #include <memory> diff --git a/src/backends/cl/workloads/ClSplitterWorkload.cpp b/src/backends/cl/workloads/ClSplitterWorkload.cpp index 9bbbcab797..296e0a3dde 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.cpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.cpp @@ -9,6 +9,7 @@ #include <aclCommon/ArmComputeTensorUtils.hpp> #include <aclCommon/ArmComputeUtils.hpp> +#include <arm_compute/runtime/CL/functions/CLSplit.h> #include <backendsCommon/CpuTensorHandle.hpp> #include <cl/ClTensorHandle.hpp> @@ -84,7 +85,6 @@ ClSplitterWorkload::ClSplitterWorkload(const SplitterQueueDescriptor& descriptor } // Create the layer function - m_Layer.reset(new arm_compute::CLSplit()); // Configure input and output tensors std::set<unsigned int> splitAxis = ComputeSplitAxis(descriptor.m_Parameters, m_Data.m_Inputs[0]->GetShape()); @@ -94,10 +94,13 @@ ClSplitterWorkload::ClSplitterWorkload(const SplitterQueueDescriptor& descriptor } unsigned int aclAxis = CalcAclAxis(descriptor.m_Parameters.GetNumDimensions(), *splitAxis.begin()); - m_Layer->configure(&input, aclOutputs, aclAxis); + auto layer = std::make_unique<arm_compute::CLSplit>(); + layer->configure(&input, aclOutputs, aclAxis); // Prepare - m_Layer->prepare(); + layer->prepare(); + + m_Layer = std::move(layer); } void ClSplitterWorkload::Execute() const diff --git a/src/backends/cl/workloads/ClSplitterWorkload.hpp b/src/backends/cl/workloads/ClSplitterWorkload.hpp index d024452d78..82211f5baf 100644 --- a/src/backends/cl/workloads/ClSplitterWorkload.hpp +++ b/src/backends/cl/workloads/ClSplitterWorkload.hpp @@ -7,7 +7,8 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/core/Error.h> +#include <arm_compute/runtime/IFunction.h> #include <functional> @@ -26,7 +27,7 @@ public: void Execute() const override; private: - mutable std::unique_ptr<arm_compute::CLSplit> m_Layer; + std::unique_ptr<arm_compute::IFunction> m_Layer; }; } //namespace armnn diff --git a/src/backends/cl/workloads/ClStackWorkload.hpp b/src/backends/cl/workloads/ClStackWorkload.hpp index 75008697a3..f27d6cdad0 100644 --- a/src/backends/cl/workloads/ClStackWorkload.hpp +++ b/src/backends/cl/workloads/ClStackWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLStackLayer.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClStridedSliceWorkload.hpp b/src/backends/cl/workloads/ClStridedSliceWorkload.hpp index 617ec7c021..bce3fe13eb 100644 --- a/src/backends/cl/workloads/ClStridedSliceWorkload.hpp +++ b/src/backends/cl/workloads/ClStridedSliceWorkload.hpp @@ -10,7 +10,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLStridedSlice.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClSubtractionWorkload.hpp b/src/backends/cl/workloads/ClSubtractionWorkload.hpp index ba894568c7..da6d17c6ac 100644 --- a/src/backends/cl/workloads/ClSubtractionWorkload.hpp +++ b/src/backends/cl/workloads/ClSubtractionWorkload.hpp @@ -7,7 +7,7 @@ #include <backendsCommon/Workload.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/functions/CLElementwiseOperations.h> namespace armnn { diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp index 709300681c..d3c6df50ed 100644 --- a/src/backends/cl/workloads/ClWorkloadUtils.hpp +++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp @@ -12,7 +12,8 @@ #include <armnn/Utils.hpp> -#include <arm_compute/runtime/CL/CLFunctions.h> +#include <arm_compute/runtime/CL/CLTensor.h> +#include <arm_compute/runtime/IFunction.h> #include <sstream> |