diff options
Diffstat (limited to 'src/backends/reference')
85 files changed, 198 insertions, 161 deletions
diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 60d8255454..46c2706742 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -68,6 +68,7 @@ list(APPEND armnnRefBackendWorkloads_sources RefActivationWorkload.hpp RefArgMinMaxWorkload.cpp RefArgMinMaxWorkload.hpp + RefBaseWorkload.hpp RefBatchNormalizationWorkload.cpp RefBatchNormalizationWorkload.hpp RefBatchToSpaceNdWorkload.cpp diff --git a/src/backends/reference/workloads/RefActivationWorkload.hpp b/src/backends/reference/workloads/RefActivationWorkload.hpp index 9814ac172b..8dc2d52d9b 100644 --- a/src/backends/reference/workloads/RefActivationWorkload.hpp +++ b/src/backends/reference/workloads/RefActivationWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefActivationWorkload : public BaseWorkload<ActivationQueueDescriptor> +class RefActivationWorkload : public RefBaseWorkload<ActivationQueueDescriptor> { public: - using BaseWorkload<ActivationQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ActivationQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefArgMinMaxWorkload.cpp b/src/backends/reference/workloads/RefArgMinMaxWorkload.cpp index 2d635bf6c2..d724273287 100644 --- a/src/backends/reference/workloads/RefArgMinMaxWorkload.cpp +++ b/src/backends/reference/workloads/RefArgMinMaxWorkload.cpp @@ -16,7 +16,7 @@ namespace armnn RefArgMinMaxWorkload::RefArgMinMaxWorkload( const ArgMinMaxQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<ArgMinMaxQueueDescriptor>(descriptor, info) {} + : RefBaseWorkload<ArgMinMaxQueueDescriptor>(descriptor, info) {} void RefArgMinMaxWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefArgMinMaxWorkload.hpp b/src/backends/reference/workloads/RefArgMinMaxWorkload.hpp index f3c264469b..97c4b45d60 100644 --- a/src/backends/reference/workloads/RefArgMinMaxWorkload.hpp +++ b/src/backends/reference/workloads/RefArgMinMaxWorkload.hpp @@ -5,12 +5,12 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefArgMinMaxWorkload : public BaseWorkload<ArgMinMaxQueueDescriptor> +class RefArgMinMaxWorkload : public RefBaseWorkload<ArgMinMaxQueueDescriptor> { public: explicit RefArgMinMaxWorkload(const ArgMinMaxQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefBaseWorkload.hpp b/src/backends/reference/workloads/RefBaseWorkload.hpp new file mode 100644 index 0000000000..824b4ccc67 --- /dev/null +++ b/src/backends/reference/workloads/RefBaseWorkload.hpp @@ -0,0 +1,36 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <armnn/backends/Workload.hpp> + +namespace armnn +{ + template <typename QueueDescriptor> + class RefBaseWorkload : public BaseWorkload<QueueDescriptor> + { + public: + RefBaseWorkload(const QueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload<QueueDescriptor>(descriptor, info) + {} + + virtual bool SupportsTensorHandleReplacement() const override + { + return true; + } + // Replace input tensor handle with the given TensorHandle + void ReplaceInputTensorHandle(ITensorHandle* tensorHandle, unsigned int slot) override + { + this->m_Data.m_Inputs[slot] = tensorHandle; + } + + // Replace output tensor handle with the given TensorHandle + void ReplaceOutputTensorHandle(ITensorHandle* tensorHandle, unsigned int slot) override + { + this->m_Data.m_Outputs[slot] = tensorHandle; + } + }; +} //namespace armnn
\ No newline at end of file diff --git a/src/backends/reference/workloads/RefBatchNormalizationWorkload.cpp b/src/backends/reference/workloads/RefBatchNormalizationWorkload.cpp index 282374d89b..a6bd986f1d 100644 --- a/src/backends/reference/workloads/RefBatchNormalizationWorkload.cpp +++ b/src/backends/reference/workloads/RefBatchNormalizationWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn RefBatchNormalizationWorkload::RefBatchNormalizationWorkload(const BatchNormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) , m_Mean (std::make_unique<ScopedTensorHandle>(*(descriptor.m_Mean))) , m_Variance(std::make_unique<ScopedTensorHandle>(*(descriptor.m_Variance))) , m_Beta (std::make_unique<ScopedTensorHandle>(*(descriptor.m_Beta))) diff --git a/src/backends/reference/workloads/RefBatchNormalizationWorkload.hpp b/src/backends/reference/workloads/RefBatchNormalizationWorkload.hpp index 305c0ce573..60dd2a927c 100644 --- a/src/backends/reference/workloads/RefBatchNormalizationWorkload.hpp +++ b/src/backends/reference/workloads/RefBatchNormalizationWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefBatchNormalizationWorkload : public BaseWorkload<BatchNormalizationQueueDescriptor> +class RefBatchNormalizationWorkload : public RefBaseWorkload<BatchNormalizationQueueDescriptor> { public: explicit RefBatchNormalizationWorkload(const BatchNormalizationQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefBatchToSpaceNdWorkload.hpp b/src/backends/reference/workloads/RefBatchToSpaceNdWorkload.hpp index 7d18c12476..d7ee6fc81c 100644 --- a/src/backends/reference/workloads/RefBatchToSpaceNdWorkload.hpp +++ b/src/backends/reference/workloads/RefBatchToSpaceNdWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefBatchToSpaceNdWorkload : public BaseWorkload<BatchToSpaceNdQueueDescriptor> +class RefBatchToSpaceNdWorkload : public RefBaseWorkload<BatchToSpaceNdQueueDescriptor> { public: - using BaseWorkload<BatchToSpaceNdQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<BatchToSpaceNdQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefCastWorkload.hpp b/src/backends/reference/workloads/RefCastWorkload.hpp index ccafaafac9..6f7e56a6b6 100644 --- a/src/backends/reference/workloads/RefCastWorkload.hpp +++ b/src/backends/reference/workloads/RefCastWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "RefWorkloadUtils.hpp" @@ -13,10 +13,10 @@ namespace armnn { -class RefCastWorkload : public BaseWorkload<CastQueueDescriptor> +class RefCastWorkload : public RefBaseWorkload<CastQueueDescriptor> { public: - using BaseWorkload<CastQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<CastQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefChannelShuffleWorkload.hpp b/src/backends/reference/workloads/RefChannelShuffleWorkload.hpp index 0c8037823a..b459b87592 100644 --- a/src/backends/reference/workloads/RefChannelShuffleWorkload.hpp +++ b/src/backends/reference/workloads/RefChannelShuffleWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefChannelShuffleWorkload : public BaseWorkload<ChannelShuffleQueueDescriptor> +class RefChannelShuffleWorkload : public RefBaseWorkload<ChannelShuffleQueueDescriptor> { public: - using BaseWorkload<ChannelShuffleQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ChannelShuffleQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefComparisonWorkload.cpp b/src/backends/reference/workloads/RefComparisonWorkload.cpp index 03df7a4c4a..433e3e8ad8 100644 --- a/src/backends/reference/workloads/RefComparisonWorkload.cpp +++ b/src/backends/reference/workloads/RefComparisonWorkload.cpp @@ -21,7 +21,7 @@ namespace armnn RefComparisonWorkload::RefComparisonWorkload(const ComparisonQueueDescriptor& desc, const WorkloadInfo& info) - : BaseWorkload<ComparisonQueueDescriptor>(desc, info) + : RefBaseWorkload<ComparisonQueueDescriptor>(desc, info) {} void RefComparisonWorkload::PostAllocationConfigure() diff --git a/src/backends/reference/workloads/RefComparisonWorkload.hpp b/src/backends/reference/workloads/RefComparisonWorkload.hpp index f2780c7ae5..93cfd1f2b1 100644 --- a/src/backends/reference/workloads/RefComparisonWorkload.hpp +++ b/src/backends/reference/workloads/RefComparisonWorkload.hpp @@ -7,16 +7,16 @@ #include "BaseIterator.hpp" -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefComparisonWorkload : public BaseWorkload<ComparisonQueueDescriptor> +class RefComparisonWorkload : public RefBaseWorkload<ComparisonQueueDescriptor> { public: - using BaseWorkload<ComparisonQueueDescriptor>::m_Data; + using RefBaseWorkload<ComparisonQueueDescriptor>::m_Data; RefComparisonWorkload(const ComparisonQueueDescriptor& descriptor, const WorkloadInfo& info); void PostAllocationConfigure() override; diff --git a/src/backends/reference/workloads/RefConcatWorkload.hpp b/src/backends/reference/workloads/RefConcatWorkload.hpp index cb1ecf06a7..11d6d016ed 100644 --- a/src/backends/reference/workloads/RefConcatWorkload.hpp +++ b/src/backends/reference/workloads/RefConcatWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefConcatWorkload : public BaseWorkload<ConcatQueueDescriptor> +class RefConcatWorkload : public RefBaseWorkload<ConcatQueueDescriptor> { public: - using BaseWorkload<ConcatQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ConcatQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefConstantWorkload.cpp b/src/backends/reference/workloads/RefConstantWorkload.cpp index 6290237d69..571dbb219a 100644 --- a/src/backends/reference/workloads/RefConstantWorkload.cpp +++ b/src/backends/reference/workloads/RefConstantWorkload.cpp @@ -18,7 +18,7 @@ namespace armnn RefConstantWorkload::RefConstantWorkload( const ConstantQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<ConstantQueueDescriptor>(descriptor, info) {} + : RefBaseWorkload<ConstantQueueDescriptor>(descriptor, info) {} void RefConstantWorkload::Execute() const { diff --git a/src/backends/reference/workloads/RefConstantWorkload.hpp b/src/backends/reference/workloads/RefConstantWorkload.hpp index c158983d7a..181d79d320 100644 --- a/src/backends/reference/workloads/RefConstantWorkload.hpp +++ b/src/backends/reference/workloads/RefConstantWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include <armnn/Types.hpp> @@ -14,7 +14,7 @@ namespace armnn { // Base class template providing an implementation of the Constant layer common to all data types. -class RefConstantWorkload : public BaseWorkload<ConstantQueueDescriptor> +class RefConstantWorkload : public RefBaseWorkload<ConstantQueueDescriptor> { public: RefConstantWorkload(const ConstantQueueDescriptor& descriptor, const WorkloadInfo& info); diff --git a/src/backends/reference/workloads/RefConvertBf16ToFp32Workload.hpp b/src/backends/reference/workloads/RefConvertBf16ToFp32Workload.hpp index b3af111fa3..8b5c6d56c2 100644 --- a/src/backends/reference/workloads/RefConvertBf16ToFp32Workload.hpp +++ b/src/backends/reference/workloads/RefConvertBf16ToFp32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn diff --git a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp index acb1995b9f..feb442ef5a 100644 --- a/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp16ToFp32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn diff --git a/src/backends/reference/workloads/RefConvertFp32ToBf16Workload.hpp b/src/backends/reference/workloads/RefConvertFp32ToBf16Workload.hpp index 97a138f49c..cd3cfa4cf3 100644 --- a/src/backends/reference/workloads/RefConvertFp32ToBf16Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp32ToBf16Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn diff --git a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp index 8cc822e7d8..fe137ed62f 100644 --- a/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp +++ b/src/backends/reference/workloads/RefConvertFp32ToFp16Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn diff --git a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp index 20c5c08b17..d57040eaec 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp @@ -14,7 +14,7 @@ namespace armnn { RefConvolution2dWorkload::RefConvolution2dWorkload( const Convolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<Convolution2dQueueDescriptor>(descriptor, info) + : RefBaseWorkload<Convolution2dQueueDescriptor>(descriptor, info) { WorkloadInfo detailsInfo; detailsInfo.m_InputTensorInfos = info.m_InputTensorInfos; diff --git a/src/backends/reference/workloads/RefConvolution2dWorkload.hpp b/src/backends/reference/workloads/RefConvolution2dWorkload.hpp index 880547dc33..3335782f78 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.hpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" #include "Encoders.hpp" @@ -13,7 +13,7 @@ namespace armnn { -class RefConvolution2dWorkload : public BaseWorkload<Convolution2dQueueDescriptor> +class RefConvolution2dWorkload : public RefBaseWorkload<Convolution2dQueueDescriptor> { public: explicit RefConvolution2dWorkload(const Convolution2dQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefConvolution3dWorkload.cpp b/src/backends/reference/workloads/RefConvolution3dWorkload.cpp index afab88f0a8..5f542807ed 100644 --- a/src/backends/reference/workloads/RefConvolution3dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution3dWorkload.cpp @@ -14,7 +14,7 @@ namespace armnn { RefConvolution3dWorkload::RefConvolution3dWorkload( const Convolution3dQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<Convolution3dQueueDescriptor>(descriptor, info) + : RefBaseWorkload<Convolution3dQueueDescriptor>(descriptor, info) { WorkloadInfo detailsInfo; detailsInfo.m_InputTensorInfos = info.m_InputTensorInfos; diff --git a/src/backends/reference/workloads/RefConvolution3dWorkload.hpp b/src/backends/reference/workloads/RefConvolution3dWorkload.hpp index 53ce309eb8..6c74675eec 100644 --- a/src/backends/reference/workloads/RefConvolution3dWorkload.hpp +++ b/src/backends/reference/workloads/RefConvolution3dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" #include "Encoders.hpp" @@ -13,7 +13,7 @@ namespace armnn { -class RefConvolution3dWorkload : public BaseWorkload<Convolution3dQueueDescriptor> +class RefConvolution3dWorkload : public RefBaseWorkload<Convolution3dQueueDescriptor> { public: explicit RefConvolution3dWorkload(const Convolution3dQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefDebugWorkload.hpp b/src/backends/reference/workloads/RefDebugWorkload.hpp index 66af9a0b0f..a1579599f4 100644 --- a/src/backends/reference/workloads/RefDebugWorkload.hpp +++ b/src/backends/reference/workloads/RefDebugWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/TypesUtils.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" namespace armnn { diff --git a/src/backends/reference/workloads/RefDepthToSpaceWorkload.hpp b/src/backends/reference/workloads/RefDepthToSpaceWorkload.hpp index 854a564062..bd179d3b9c 100644 --- a/src/backends/reference/workloads/RefDepthToSpaceWorkload.hpp +++ b/src/backends/reference/workloads/RefDepthToSpaceWorkload.hpp @@ -5,15 +5,15 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" namespace armnn { -class RefDepthToSpaceWorkload : public BaseWorkload<DepthToSpaceQueueDescriptor> +class RefDepthToSpaceWorkload : public RefBaseWorkload<DepthToSpaceQueueDescriptor> { public: - using BaseWorkload<DepthToSpaceQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<DepthToSpaceQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.cpp index b447d1a441..ad5edde7e6 100644 --- a/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.cpp @@ -17,7 +17,7 @@ namespace armnn RefDepthwiseConvolution2dWorkload::RefDepthwiseConvolution2dWorkload( const DepthwiseConvolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<DepthwiseConvolution2dQueueDescriptor>(descriptor, info) + : RefBaseWorkload<DepthwiseConvolution2dQueueDescriptor>(descriptor, info) { m_Weight = std::make_unique<ScopedTensorHandle>(*(descriptor.m_Weight)); const TensorInfo& rFilterInfo = m_Weight->GetTensorInfo(); diff --git a/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.hpp b/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.hpp index ae93d03656..5d4b483fa7 100644 --- a/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.hpp +++ b/src/backends/reference/workloads/RefDepthwiseConvolution2dWorkload.hpp @@ -2,7 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" #include "Encoders.hpp" @@ -12,7 +12,7 @@ namespace armnn { -class RefDepthwiseConvolution2dWorkload : public BaseWorkload<DepthwiseConvolution2dQueueDescriptor> { +class RefDepthwiseConvolution2dWorkload : public RefBaseWorkload<DepthwiseConvolution2dQueueDescriptor> { public: explicit RefDepthwiseConvolution2dWorkload(const DepthwiseConvolution2dQueueDescriptor &descriptor, const WorkloadInfo &info); diff --git a/src/backends/reference/workloads/RefDequantizeWorkload.hpp b/src/backends/reference/workloads/RefDequantizeWorkload.hpp index 285c6496bb..8fa8951677 100644 --- a/src/backends/reference/workloads/RefDequantizeWorkload.hpp +++ b/src/backends/reference/workloads/RefDequantizeWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" namespace armnn { -class RefDequantizeWorkload : public BaseWorkload<DequantizeQueueDescriptor> +class RefDequantizeWorkload : public RefBaseWorkload<DequantizeQueueDescriptor> { public: - using BaseWorkload<DequantizeQueueDescriptor>::m_Data; - using BaseWorkload<DequantizeQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<DequantizeQueueDescriptor>::m_Data; + using RefBaseWorkload<DequantizeQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefDetectionPostProcessWorkload.cpp b/src/backends/reference/workloads/RefDetectionPostProcessWorkload.cpp index 4bc9eb1704..5f01db3280 100644 --- a/src/backends/reference/workloads/RefDetectionPostProcessWorkload.cpp +++ b/src/backends/reference/workloads/RefDetectionPostProcessWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn RefDetectionPostProcessWorkload::RefDetectionPostProcessWorkload( const DetectionPostProcessQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<DetectionPostProcessQueueDescriptor>(descriptor, info), + : RefBaseWorkload<DetectionPostProcessQueueDescriptor>(descriptor, info), m_Anchors(std::make_unique<ScopedTensorHandle>(*(descriptor.m_Anchors))) {} void RefDetectionPostProcessWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefDetectionPostProcessWorkload.hpp b/src/backends/reference/workloads/RefDetectionPostProcessWorkload.hpp index 4c3ad42b0f..53b2971063 100644 --- a/src/backends/reference/workloads/RefDetectionPostProcessWorkload.hpp +++ b/src/backends/reference/workloads/RefDetectionPostProcessWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefDetectionPostProcessWorkload : public BaseWorkload<DetectionPostProcessQueueDescriptor> +class RefDetectionPostProcessWorkload : public RefBaseWorkload<DetectionPostProcessQueueDescriptor> { public: explicit RefDetectionPostProcessWorkload(const DetectionPostProcessQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp index be153636f9..3ea51b9f69 100644 --- a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp +++ b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.cpp @@ -27,7 +27,7 @@ namespace armnn RefElementwiseUnaryWorkload::RefElementwiseUnaryWorkload(const ElementwiseUnaryQueueDescriptor& desc, const WorkloadInfo& info) - : BaseWorkload<ElementwiseUnaryQueueDescriptor>(desc, info) + : RefBaseWorkload<ElementwiseUnaryQueueDescriptor>(desc, info) {} void RefElementwiseUnaryWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.hpp b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.hpp index e055fd012c..91229b3c58 100644 --- a/src/backends/reference/workloads/RefElementwiseUnaryWorkload.hpp +++ b/src/backends/reference/workloads/RefElementwiseUnaryWorkload.hpp @@ -7,16 +7,16 @@ #include "BaseIterator.hpp" -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefElementwiseUnaryWorkload : public BaseWorkload<ElementwiseUnaryQueueDescriptor> +class RefElementwiseUnaryWorkload : public RefBaseWorkload<ElementwiseUnaryQueueDescriptor> { public: - using BaseWorkload<ElementwiseUnaryQueueDescriptor>::m_Data; + using RefBaseWorkload<ElementwiseUnaryQueueDescriptor>::m_Data; RefElementwiseUnaryWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/reference/workloads/RefElementwiseWorkload.cpp b/src/backends/reference/workloads/RefElementwiseWorkload.cpp index dd7d325ca5..d14ce075b0 100644 --- a/src/backends/reference/workloads/RefElementwiseWorkload.cpp +++ b/src/backends/reference/workloads/RefElementwiseWorkload.cpp @@ -21,7 +21,7 @@ template <typename Functor, typename ParentDescriptor, typename armnn::StringMap RefElementwiseWorkload<Functor, ParentDescriptor, DebugString>::RefElementwiseWorkload( const ParentDescriptor& desc, const WorkloadInfo& info) - : BaseWorkload<ParentDescriptor>(desc, info) + : RefBaseWorkload<ParentDescriptor>(desc, info) { } diff --git a/src/backends/reference/workloads/RefElementwiseWorkload.hpp b/src/backends/reference/workloads/RefElementwiseWorkload.hpp index 4b108e4363..065a7833d7 100644 --- a/src/backends/reference/workloads/RefElementwiseWorkload.hpp +++ b/src/backends/reference/workloads/RefElementwiseWorkload.hpp @@ -6,7 +6,7 @@ #pragma once #include <armnn/Types.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "BaseIterator.hpp" #include "ElementwiseFunction.hpp" @@ -18,12 +18,12 @@ namespace armnn { template <typename Functor, typename ParentDescriptor, typename armnn::StringMapping::Id DebugString> -class RefElementwiseWorkload : public BaseWorkload<ParentDescriptor> +class RefElementwiseWorkload : public RefBaseWorkload<ParentDescriptor> { public: using InType = typename ElementwiseBinaryFunction<Functor>::InType; using OutType = typename ElementwiseBinaryFunction<Functor>::OutType; - using BaseWorkload<ParentDescriptor>::m_Data; + using RefBaseWorkload<ParentDescriptor>::m_Data; RefElementwiseWorkload(const ParentDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp index 53b3375a50..85dc6af326 100644 --- a/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp +++ b/src/backends/reference/workloads/RefFakeQuantizationFloat32Workload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn diff --git a/src/backends/reference/workloads/RefFillWorkload.hpp b/src/backends/reference/workloads/RefFillWorkload.hpp index 56d44b85f7..d1e00581cd 100644 --- a/src/backends/reference/workloads/RefFillWorkload.hpp +++ b/src/backends/reference/workloads/RefFillWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefFillWorkload : public BaseWorkload<FillQueueDescriptor> +class RefFillWorkload : public RefBaseWorkload<FillQueueDescriptor> { public: - using BaseWorkload<FillQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<FillQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefFloorWorkload.hpp b/src/backends/reference/workloads/RefFloorWorkload.hpp index 1a532f7a49..6237ff0c61 100644 --- a/src/backends/reference/workloads/RefFloorWorkload.hpp +++ b/src/backends/reference/workloads/RefFloorWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefFloorWorkload : public BaseWorkload<FloorQueueDescriptor> +class RefFloorWorkload : public RefBaseWorkload<FloorQueueDescriptor> { public: - using BaseWorkload<FloorQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<FloorQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefFullyConnectedWorkload.cpp b/src/backends/reference/workloads/RefFullyConnectedWorkload.cpp index 5a7951ec48..c6ea147043 100644 --- a/src/backends/reference/workloads/RefFullyConnectedWorkload.cpp +++ b/src/backends/reference/workloads/RefFullyConnectedWorkload.cpp @@ -14,7 +14,7 @@ namespace armnn { RefFullyConnectedWorkload::RefFullyConnectedWorkload( const FullyConnectedQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<FullyConnectedQueueDescriptor>(descriptor, info) + : RefBaseWorkload<FullyConnectedQueueDescriptor>(descriptor, info) { } diff --git a/src/backends/reference/workloads/RefFullyConnectedWorkload.hpp b/src/backends/reference/workloads/RefFullyConnectedWorkload.hpp index 3ee4a4a83c..432a8879a0 100644 --- a/src/backends/reference/workloads/RefFullyConnectedWorkload.hpp +++ b/src/backends/reference/workloads/RefFullyConnectedWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "BaseIterator.hpp" #include "Decoders.hpp" @@ -15,7 +15,7 @@ namespace armnn { -class RefFullyConnectedWorkload : public BaseWorkload<FullyConnectedQueueDescriptor> +class RefFullyConnectedWorkload : public RefBaseWorkload<FullyConnectedQueueDescriptor> { public: explicit RefFullyConnectedWorkload(const FullyConnectedQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefGatherWorkload.hpp b/src/backends/reference/workloads/RefGatherWorkload.hpp index a2698e3a25..ec880a5109 100644 --- a/src/backends/reference/workloads/RefGatherWorkload.hpp +++ b/src/backends/reference/workloads/RefGatherWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include <armnn/TypesUtils.hpp> @@ -16,10 +16,10 @@ namespace armnn { -class RefGatherWorkload : public BaseWorkload<GatherQueueDescriptor> +class RefGatherWorkload : public RefBaseWorkload<GatherQueueDescriptor> { public: - using BaseWorkload<GatherQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<GatherQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefInstanceNormalizationWorkload.cpp b/src/backends/reference/workloads/RefInstanceNormalizationWorkload.cpp index e642dc9b9a..c103a6b9d3 100644 --- a/src/backends/reference/workloads/RefInstanceNormalizationWorkload.cpp +++ b/src/backends/reference/workloads/RefInstanceNormalizationWorkload.cpp @@ -16,7 +16,7 @@ namespace armnn RefInstanceNormalizationWorkload::RefInstanceNormalizationWorkload( const InstanceNormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<InstanceNormalizationQueueDescriptor>(descriptor, info) {} + : RefBaseWorkload<InstanceNormalizationQueueDescriptor>(descriptor, info) {} void RefInstanceNormalizationWorkload::Execute() const { diff --git a/src/backends/reference/workloads/RefInstanceNormalizationWorkload.hpp b/src/backends/reference/workloads/RefInstanceNormalizationWorkload.hpp index 3283c444d2..a4b2dd39cb 100644 --- a/src/backends/reference/workloads/RefInstanceNormalizationWorkload.hpp +++ b/src/backends/reference/workloads/RefInstanceNormalizationWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefInstanceNormalizationWorkload : public BaseWorkload<InstanceNormalizationQueueDescriptor> +class RefInstanceNormalizationWorkload : public RefBaseWorkload<InstanceNormalizationQueueDescriptor> { public: explicit RefInstanceNormalizationWorkload(const InstanceNormalizationQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefL2NormalizationWorkload.cpp b/src/backends/reference/workloads/RefL2NormalizationWorkload.cpp index ca31503620..f6fcff3cc5 100644 --- a/src/backends/reference/workloads/RefL2NormalizationWorkload.cpp +++ b/src/backends/reference/workloads/RefL2NormalizationWorkload.cpp @@ -22,7 +22,7 @@ namespace armnn RefL2NormalizationWorkload::RefL2NormalizationWorkload( const L2NormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<L2NormalizationQueueDescriptor>(descriptor, info) {} + : RefBaseWorkload<L2NormalizationQueueDescriptor>(descriptor, info) {} void RefL2NormalizationWorkload::Execute() const { diff --git a/src/backends/reference/workloads/RefL2NormalizationWorkload.hpp b/src/backends/reference/workloads/RefL2NormalizationWorkload.hpp index dd129c663e..c64e2ea0fd 100644 --- a/src/backends/reference/workloads/RefL2NormalizationWorkload.hpp +++ b/src/backends/reference/workloads/RefL2NormalizationWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefL2NormalizationWorkload : public BaseWorkload<L2NormalizationQueueDescriptor> +class RefL2NormalizationWorkload : public RefBaseWorkload<L2NormalizationQueueDescriptor> { public: explicit RefL2NormalizationWorkload(const L2NormalizationQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefLogSoftmaxWorkload.hpp b/src/backends/reference/workloads/RefLogSoftmaxWorkload.hpp index 9f87def1bd..91ad5f6c36 100644 --- a/src/backends/reference/workloads/RefLogSoftmaxWorkload.hpp +++ b/src/backends/reference/workloads/RefLogSoftmaxWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefLogSoftmaxWorkload : public BaseWorkload<LogSoftmaxQueueDescriptor> +class RefLogSoftmaxWorkload : public RefBaseWorkload<LogSoftmaxQueueDescriptor> { public: - using BaseWorkload<LogSoftmaxQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<LogSoftmaxQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefLogicalBinaryWorkload.cpp b/src/backends/reference/workloads/RefLogicalBinaryWorkload.cpp index f187e0ca31..f0cb846acf 100644 --- a/src/backends/reference/workloads/RefLogicalBinaryWorkload.cpp +++ b/src/backends/reference/workloads/RefLogicalBinaryWorkload.cpp @@ -19,7 +19,7 @@ namespace armnn RefLogicalBinaryWorkload::RefLogicalBinaryWorkload(const LogicalBinaryQueueDescriptor& desc, const WorkloadInfo& info) - : BaseWorkload<LogicalBinaryQueueDescriptor>(desc, info) + : RefBaseWorkload<LogicalBinaryQueueDescriptor>(desc, info) {} void RefLogicalBinaryWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefLogicalBinaryWorkload.hpp b/src/backends/reference/workloads/RefLogicalBinaryWorkload.hpp index 053de7daf9..797d937d80 100644 --- a/src/backends/reference/workloads/RefLogicalBinaryWorkload.hpp +++ b/src/backends/reference/workloads/RefLogicalBinaryWorkload.hpp @@ -7,16 +7,16 @@ #include "BaseIterator.hpp" -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefLogicalBinaryWorkload : public BaseWorkload<LogicalBinaryQueueDescriptor> +class RefLogicalBinaryWorkload : public RefBaseWorkload<LogicalBinaryQueueDescriptor> { public: - using BaseWorkload<LogicalBinaryQueueDescriptor>::m_Data; + using RefBaseWorkload<LogicalBinaryQueueDescriptor>::m_Data; RefLogicalBinaryWorkload(const LogicalBinaryQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/reference/workloads/RefLogicalUnaryWorkload.cpp b/src/backends/reference/workloads/RefLogicalUnaryWorkload.cpp index bef2bdc668..ec0aa0e454 100644 --- a/src/backends/reference/workloads/RefLogicalUnaryWorkload.cpp +++ b/src/backends/reference/workloads/RefLogicalUnaryWorkload.cpp @@ -19,7 +19,7 @@ namespace armnn RefLogicalUnaryWorkload::RefLogicalUnaryWorkload(const ElementwiseUnaryQueueDescriptor& desc, const WorkloadInfo& info) - : BaseWorkload<ElementwiseUnaryQueueDescriptor>(desc, info) + : RefBaseWorkload<ElementwiseUnaryQueueDescriptor>(desc, info) {} void RefLogicalUnaryWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefLogicalUnaryWorkload.hpp b/src/backends/reference/workloads/RefLogicalUnaryWorkload.hpp index 008d24fef8..ebd5826cc5 100644 --- a/src/backends/reference/workloads/RefLogicalUnaryWorkload.hpp +++ b/src/backends/reference/workloads/RefLogicalUnaryWorkload.hpp @@ -7,16 +7,16 @@ #include "BaseIterator.hpp" -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefLogicalUnaryWorkload : public BaseWorkload<ElementwiseUnaryQueueDescriptor> +class RefLogicalUnaryWorkload : public RefBaseWorkload<ElementwiseUnaryQueueDescriptor> { public: - using BaseWorkload<ElementwiseUnaryQueueDescriptor>::m_Data; + using RefBaseWorkload<ElementwiseUnaryQueueDescriptor>::m_Data; RefLogicalUnaryWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); void Execute() const override; diff --git a/src/backends/reference/workloads/RefLstmWorkload.cpp b/src/backends/reference/workloads/RefLstmWorkload.cpp index 1ff6f50ed5..8609811253 100644 --- a/src/backends/reference/workloads/RefLstmWorkload.cpp +++ b/src/backends/reference/workloads/RefLstmWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn { RefLstmWorkload::RefLstmWorkload(const LstmQueueDescriptor &descriptor, const WorkloadInfo &info) - : BaseWorkload<LstmQueueDescriptor>(descriptor, info) + : RefBaseWorkload<LstmQueueDescriptor>(descriptor, info) , m_InputToInputWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToInputWeights)) , m_InputToForgetWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToForgetWeights)) , m_InputToCellWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToCellWeights)) diff --git a/src/backends/reference/workloads/RefLstmWorkload.hpp b/src/backends/reference/workloads/RefLstmWorkload.hpp index 72f6360281..57526c9ba2 100644 --- a/src/backends/reference/workloads/RefLstmWorkload.hpp +++ b/src/backends/reference/workloads/RefLstmWorkload.hpp @@ -7,13 +7,13 @@ #include <armnn/TypesUtils.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefLstmWorkload : public BaseWorkload<LstmQueueDescriptor> +class RefLstmWorkload : public RefBaseWorkload<LstmQueueDescriptor> { public: explicit RefLstmWorkload(const LstmQueueDescriptor& descriptor, const WorkloadInfo& info); diff --git a/src/backends/reference/workloads/RefMeanWorkload.cpp b/src/backends/reference/workloads/RefMeanWorkload.cpp index 7941ce2c36..23abaf8ff4 100644 --- a/src/backends/reference/workloads/RefMeanWorkload.cpp +++ b/src/backends/reference/workloads/RefMeanWorkload.cpp @@ -16,7 +16,7 @@ namespace armnn { RefMeanWorkload::RefMeanWorkload(const MeanQueueDescriptor& descriptor, const WorkloadInfo& info) - :BaseWorkload<MeanQueueDescriptor>(descriptor, info) {} + :RefBaseWorkload<MeanQueueDescriptor>(descriptor, info) {} void RefMeanWorkload::Execute() const { diff --git a/src/backends/reference/workloads/RefMeanWorkload.hpp b/src/backends/reference/workloads/RefMeanWorkload.hpp index 2825d669c4..c4c6a1261c 100644 --- a/src/backends/reference/workloads/RefMeanWorkload.hpp +++ b/src/backends/reference/workloads/RefMeanWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" @@ -14,7 +14,7 @@ namespace armnn { -class RefMeanWorkload : public BaseWorkload<MeanQueueDescriptor> +class RefMeanWorkload : public RefBaseWorkload<MeanQueueDescriptor> { public: explicit RefMeanWorkload (const MeanQueueDescriptor& descriptor, const WorkloadInfo& info); diff --git a/src/backends/reference/workloads/RefNormalizationWorkload.cpp b/src/backends/reference/workloads/RefNormalizationWorkload.cpp index 36828acfb3..613868de57 100644 --- a/src/backends/reference/workloads/RefNormalizationWorkload.cpp +++ b/src/backends/reference/workloads/RefNormalizationWorkload.cpp @@ -158,7 +158,7 @@ namespace armnn RefNormalizationWorkload::RefNormalizationWorkload(const NormalizationQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) {} void RefNormalizationWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefNormalizationWorkload.hpp b/src/backends/reference/workloads/RefNormalizationWorkload.hpp index b152072496..5218e1e43a 100644 --- a/src/backends/reference/workloads/RefNormalizationWorkload.hpp +++ b/src/backends/reference/workloads/RefNormalizationWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefNormalizationWorkload : public BaseWorkload<NormalizationQueueDescriptor> +class RefNormalizationWorkload : public RefBaseWorkload<NormalizationQueueDescriptor> { public: explicit RefNormalizationWorkload(const NormalizationQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefPadWorkload.hpp b/src/backends/reference/workloads/RefPadWorkload.hpp index 18c406a4de..c5871059cc 100644 --- a/src/backends/reference/workloads/RefPadWorkload.hpp +++ b/src/backends/reference/workloads/RefPadWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefPadWorkload : public BaseWorkload<PadQueueDescriptor> +class RefPadWorkload : public RefBaseWorkload<PadQueueDescriptor> { public: - using BaseWorkload<PadQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<PadQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefPermuteWorkload.hpp b/src/backends/reference/workloads/RefPermuteWorkload.hpp index 9424441c37..d1e44520a1 100644 --- a/src/backends/reference/workloads/RefPermuteWorkload.hpp +++ b/src/backends/reference/workloads/RefPermuteWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/TypesUtils.hpp> diff --git a/src/backends/reference/workloads/RefPooling2dWorkload.hpp b/src/backends/reference/workloads/RefPooling2dWorkload.hpp index 125fea8d4e..a073e3921b 100644 --- a/src/backends/reference/workloads/RefPooling2dWorkload.hpp +++ b/src/backends/reference/workloads/RefPooling2dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" @@ -13,10 +13,10 @@ namespace armnn { -class RefPooling2dWorkload : public BaseWorkload<Pooling2dQueueDescriptor> +class RefPooling2dWorkload : public RefBaseWorkload<Pooling2dQueueDescriptor> { public: - using BaseWorkload<Pooling2dQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<Pooling2dQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefPooling3dWorkload.hpp b/src/backends/reference/workloads/RefPooling3dWorkload.hpp index 911c438627..92bc4766cf 100644 --- a/src/backends/reference/workloads/RefPooling3dWorkload.hpp +++ b/src/backends/reference/workloads/RefPooling3dWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" @@ -13,10 +13,10 @@ namespace armnn { -class RefPooling3dWorkload : public BaseWorkload<Pooling3dQueueDescriptor> +class RefPooling3dWorkload : public RefBaseWorkload<Pooling3dQueueDescriptor> { public: - using BaseWorkload<Pooling3dQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<Pooling3dQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefPreluWorkload.cpp b/src/backends/reference/workloads/RefPreluWorkload.cpp index c1d8de2d01..94eeea1884 100644 --- a/src/backends/reference/workloads/RefPreluWorkload.cpp +++ b/src/backends/reference/workloads/RefPreluWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn RefPreluWorkload::RefPreluWorkload(const PreluQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) {} void RefPreluWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefPreluWorkload.hpp b/src/backends/reference/workloads/RefPreluWorkload.hpp index b5c97dfa90..51ba2c15a7 100644 --- a/src/backends/reference/workloads/RefPreluWorkload.hpp +++ b/src/backends/reference/workloads/RefPreluWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefPreluWorkload : public BaseWorkload<PreluQueueDescriptor> +class RefPreluWorkload : public RefBaseWorkload<PreluQueueDescriptor> { public: explicit RefPreluWorkload(const PreluQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefQLstmWorkload.cpp b/src/backends/reference/workloads/RefQLstmWorkload.cpp index dc29d0b92d..74f5f1ef4c 100644 --- a/src/backends/reference/workloads/RefQLstmWorkload.cpp +++ b/src/backends/reference/workloads/RefQLstmWorkload.cpp @@ -14,7 +14,7 @@ namespace armnn { RefQLstmWorkload::RefQLstmWorkload(const QLstmQueueDescriptor &descriptor, const WorkloadInfo &info) - : BaseWorkload<QLstmQueueDescriptor>(descriptor, info) + : RefBaseWorkload<QLstmQueueDescriptor>(descriptor, info) , m_InputToInputWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToInputWeights)) , m_InputToForgetWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToForgetWeights)) , m_InputToCellWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToCellWeights)) diff --git a/src/backends/reference/workloads/RefQLstmWorkload.hpp b/src/backends/reference/workloads/RefQLstmWorkload.hpp index 093cfd16af..0e64a38ac9 100644 --- a/src/backends/reference/workloads/RefQLstmWorkload.hpp +++ b/src/backends/reference/workloads/RefQLstmWorkload.hpp @@ -7,13 +7,13 @@ #include <armnn/TypesUtils.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefQLstmWorkload : public BaseWorkload<QLstmQueueDescriptor> +class RefQLstmWorkload : public RefBaseWorkload<QLstmQueueDescriptor> { public: explicit RefQLstmWorkload(const QLstmQueueDescriptor& descriptor, const WorkloadInfo& info); diff --git a/src/backends/reference/workloads/RefQuantizeWorkload.cpp b/src/backends/reference/workloads/RefQuantizeWorkload.cpp index 35791e65fb..10ef0e5e15 100644 --- a/src/backends/reference/workloads/RefQuantizeWorkload.cpp +++ b/src/backends/reference/workloads/RefQuantizeWorkload.cpp @@ -29,7 +29,7 @@ void QuantizeImpl(Decoder<float>& in, Encoder<float>& out, size_t numValues) } //namespace RefQuantizeWorkload::RefQuantizeWorkload(const QuantizeQueueDescriptor& descriptor, const WorkloadInfo &info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) , m_NumElements(info.m_InputTensorInfos[0].GetNumElements()) { } diff --git a/src/backends/reference/workloads/RefQuantizeWorkload.hpp b/src/backends/reference/workloads/RefQuantizeWorkload.hpp index a32efa7dd7..e38241067d 100644 --- a/src/backends/reference/workloads/RefQuantizeWorkload.hpp +++ b/src/backends/reference/workloads/RefQuantizeWorkload.hpp @@ -5,14 +5,14 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" #include "Encoders.hpp" namespace armnn { -class RefQuantizeWorkload : public BaseWorkload<QuantizeQueueDescriptor> +class RefQuantizeWorkload : public RefBaseWorkload<QuantizeQueueDescriptor> { public: RefQuantizeWorkload(const QuantizeQueueDescriptor& descriptor, const WorkloadInfo &info); diff --git a/src/backends/reference/workloads/RefRankWorkload.hpp b/src/backends/reference/workloads/RefRankWorkload.hpp index e1f30c5ba5..000828f9e4 100644 --- a/src/backends/reference/workloads/RefRankWorkload.hpp +++ b/src/backends/reference/workloads/RefRankWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "RefWorkloadUtils.hpp" @@ -13,10 +13,10 @@ namespace armnn { -struct RefRankWorkload : public BaseWorkload<RankQueueDescriptor> +struct RefRankWorkload : public RefBaseWorkload<RankQueueDescriptor> { public: - using BaseWorkload<RankQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<RankQueueDescriptor>::RefBaseWorkload; virtual void Execute() const override { Execute(m_Data.m_Inputs, m_Data.m_Outputs); diff --git a/src/backends/reference/workloads/RefReduceWorkload.cpp b/src/backends/reference/workloads/RefReduceWorkload.cpp index 821e828b6e..62881daaf7 100644 --- a/src/backends/reference/workloads/RefReduceWorkload.cpp +++ b/src/backends/reference/workloads/RefReduceWorkload.cpp @@ -16,7 +16,7 @@ namespace armnn RefReduceWorkload::RefReduceWorkload( const ReduceQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<ReduceQueueDescriptor>(descriptor, info) {} + : RefBaseWorkload<ReduceQueueDescriptor>(descriptor, info) {} void RefReduceWorkload::Execute() const { diff --git a/src/backends/reference/workloads/RefReduceWorkload.hpp b/src/backends/reference/workloads/RefReduceWorkload.hpp index d2280cc660..d759bc2ef1 100644 --- a/src/backends/reference/workloads/RefReduceWorkload.hpp +++ b/src/backends/reference/workloads/RefReduceWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefReduceWorkload : public BaseWorkload<ReduceQueueDescriptor> +class RefReduceWorkload : public RefBaseWorkload<ReduceQueueDescriptor> { public: explicit RefReduceWorkload(const ReduceQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefReshapeWorkload.hpp b/src/backends/reference/workloads/RefReshapeWorkload.hpp index 26a86c1d11..7596685336 100644 --- a/src/backends/reference/workloads/RefReshapeWorkload.hpp +++ b/src/backends/reference/workloads/RefReshapeWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefReshapeWorkload : public BaseWorkload<ReshapeQueueDescriptor> +class RefReshapeWorkload : public RefBaseWorkload<ReshapeQueueDescriptor> { public: - using BaseWorkload<ReshapeQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ReshapeQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefResizeWorkload.hpp b/src/backends/reference/workloads/RefResizeWorkload.hpp index 82949ed639..f7747193ec 100644 --- a/src/backends/reference/workloads/RefResizeWorkload.hpp +++ b/src/backends/reference/workloads/RefResizeWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefResizeWorkload : public BaseWorkload<ResizeQueueDescriptor> +class RefResizeWorkload : public RefBaseWorkload<ResizeQueueDescriptor> { public: - using BaseWorkload<ResizeQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ResizeQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefShapeWorkload.hpp b/src/backends/reference/workloads/RefShapeWorkload.hpp index 209cccda68..b7ed761e0c 100644 --- a/src/backends/reference/workloads/RefShapeWorkload.hpp +++ b/src/backends/reference/workloads/RefShapeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "RefWorkloadUtils.hpp" @@ -13,10 +13,10 @@ namespace armnn { -struct RefShapeWorkload : public BaseWorkload<ShapeQueueDescriptor> +struct RefShapeWorkload : public RefBaseWorkload<ShapeQueueDescriptor> { public: - using BaseWorkload<ShapeQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<ShapeQueueDescriptor>::RefBaseWorkload; virtual void Execute() const override { Execute(m_Data.m_Inputs, m_Data.m_Outputs); diff --git a/src/backends/reference/workloads/RefSliceWorkload.hpp b/src/backends/reference/workloads/RefSliceWorkload.hpp index 69dae5a1aa..b9dca86c4e 100644 --- a/src/backends/reference/workloads/RefSliceWorkload.hpp +++ b/src/backends/reference/workloads/RefSliceWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefSliceWorkload : public BaseWorkload<SliceQueueDescriptor> +class RefSliceWorkload : public RefBaseWorkload<SliceQueueDescriptor> { public: - using BaseWorkload<SliceQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<SliceQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; diff --git a/src/backends/reference/workloads/RefSoftmaxWorkload.hpp b/src/backends/reference/workloads/RefSoftmaxWorkload.hpp index 42dbb53373..cac102a2bb 100644 --- a/src/backends/reference/workloads/RefSoftmaxWorkload.hpp +++ b/src/backends/reference/workloads/RefSoftmaxWorkload.hpp @@ -5,16 +5,16 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefSoftmaxWorkload : public BaseWorkload<SoftmaxQueueDescriptor> +class RefSoftmaxWorkload : public RefBaseWorkload<SoftmaxQueueDescriptor> { public: - using BaseWorkload<SoftmaxQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<SoftmaxQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.hpp b/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.hpp index ec764c75bb..eb2d93fb86 100644 --- a/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.hpp +++ b/src/backends/reference/workloads/RefSpaceToBatchNdWorkload.hpp @@ -4,17 +4,17 @@ // #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/TypesUtils.hpp> namespace armnn { -class RefSpaceToBatchNdWorkload : public BaseWorkload<SpaceToBatchNdQueueDescriptor> +class RefSpaceToBatchNdWorkload : public RefBaseWorkload<SpaceToBatchNdQueueDescriptor> { public: - using BaseWorkload<SpaceToBatchNdQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<SpaceToBatchNdQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefSpaceToDepthWorkload.hpp b/src/backends/reference/workloads/RefSpaceToDepthWorkload.hpp index bc71fde20d..17f8d2f61e 100644 --- a/src/backends/reference/workloads/RefSpaceToDepthWorkload.hpp +++ b/src/backends/reference/workloads/RefSpaceToDepthWorkload.hpp @@ -4,17 +4,17 @@ // #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/TypesUtils.hpp> namespace armnn { -class RefSpaceToDepthWorkload : public BaseWorkload<SpaceToDepthQueueDescriptor> +class RefSpaceToDepthWorkload : public RefBaseWorkload<SpaceToDepthQueueDescriptor> { public: - using BaseWorkload<SpaceToDepthQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<SpaceToDepthQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefSplitterWorkload.hpp b/src/backends/reference/workloads/RefSplitterWorkload.hpp index 28dc83db36..0b72bb9fdc 100644 --- a/src/backends/reference/workloads/RefSplitterWorkload.hpp +++ b/src/backends/reference/workloads/RefSplitterWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Decoders.hpp" #include "Encoders.hpp" @@ -13,10 +13,10 @@ namespace armnn { -class RefSplitterWorkload : public BaseWorkload<SplitterQueueDescriptor> +class RefSplitterWorkload : public RefBaseWorkload<SplitterQueueDescriptor> { public: - using BaseWorkload<SplitterQueueDescriptor>::BaseWorkload; + using RefBaseWorkload<SplitterQueueDescriptor>::RefBaseWorkload; void Execute() const override; void ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) override; private: diff --git a/src/backends/reference/workloads/RefStackWorkload.cpp b/src/backends/reference/workloads/RefStackWorkload.cpp index 3f7fd7bda2..f57e6e0f1e 100644 --- a/src/backends/reference/workloads/RefStackWorkload.cpp +++ b/src/backends/reference/workloads/RefStackWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn RefStackWorkload::RefStackWorkload(const StackQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) {} void RefStackWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefStackWorkload.hpp b/src/backends/reference/workloads/RefStackWorkload.hpp index fbca11b2fa..19f4a7be67 100644 --- a/src/backends/reference/workloads/RefStackWorkload.hpp +++ b/src/backends/reference/workloads/RefStackWorkload.hpp @@ -5,13 +5,13 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> namespace armnn { -class RefStackWorkload : public BaseWorkload<StackQueueDescriptor> +class RefStackWorkload : public RefBaseWorkload<StackQueueDescriptor> { public: explicit RefStackWorkload(const StackQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp index 336a687d5c..41fe4c3a1c 100644 --- a/src/backends/reference/workloads/RefStridedSliceWorkload.cpp +++ b/src/backends/reference/workloads/RefStridedSliceWorkload.cpp @@ -12,7 +12,7 @@ namespace armnn RefStridedSliceWorkload::RefStridedSliceWorkload(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload(descriptor, info) + : RefBaseWorkload(descriptor, info) {} void RefStridedSliceWorkload::Execute() const diff --git a/src/backends/reference/workloads/RefStridedSliceWorkload.hpp b/src/backends/reference/workloads/RefStridedSliceWorkload.hpp index d2ffca7414..ea443cf80d 100644 --- a/src/backends/reference/workloads/RefStridedSliceWorkload.hpp +++ b/src/backends/reference/workloads/RefStridedSliceWorkload.hpp @@ -5,12 +5,12 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" namespace armnn { -class RefStridedSliceWorkload : public BaseWorkload<StridedSliceQueueDescriptor> +class RefStridedSliceWorkload : public RefBaseWorkload<StridedSliceQueueDescriptor> { public: RefStridedSliceWorkload(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info); diff --git a/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.cpp index 8665648fe6..64a2d4c7b2 100644 --- a/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.cpp @@ -15,7 +15,7 @@ namespace armnn RefTransposeConvolution2dWorkload::RefTransposeConvolution2dWorkload( const TransposeConvolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) : - BaseWorkload<TransposeConvolution2dQueueDescriptor>(descriptor, info) + RefBaseWorkload<TransposeConvolution2dQueueDescriptor>(descriptor, info) { // set up weights decoder m_Weights = std::make_unique<ScopedTensorHandle>(*(descriptor.m_Weight)); diff --git a/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.hpp b/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.hpp index aa2546f420..6bcee9a838 100644 --- a/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.hpp +++ b/src/backends/reference/workloads/RefTransposeConvolution2dWorkload.hpp @@ -9,12 +9,12 @@ #include "Encoders.hpp" #include <armnn/backends/TensorHandle.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" namespace armnn { -class RefTransposeConvolution2dWorkload : public BaseWorkload<TransposeConvolution2dQueueDescriptor> +class RefTransposeConvolution2dWorkload : public RefBaseWorkload<TransposeConvolution2dQueueDescriptor> { public: RefTransposeConvolution2dWorkload(const TransposeConvolution2dQueueDescriptor& descriptor, diff --git a/src/backends/reference/workloads/RefTransposeWorkload.hpp b/src/backends/reference/workloads/RefTransposeWorkload.hpp index bf59de7813..b8c3649745 100644 --- a/src/backends/reference/workloads/RefTransposeWorkload.hpp +++ b/src/backends/reference/workloads/RefTransposeWorkload.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/TypesUtils.hpp> diff --git a/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.cpp b/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.cpp index 311fa18f91..d447a46b23 100644 --- a/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.cpp +++ b/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.cpp @@ -19,7 +19,7 @@ namespace armnn RefUnidirectionalSequenceLstmWorkload::RefUnidirectionalSequenceLstmWorkload( const UnidirectionalSequenceLstmQueueDescriptor& descriptor, const WorkloadInfo& info) - : BaseWorkload<UnidirectionalSequenceLstmQueueDescriptor>(descriptor, info) + : RefBaseWorkload<UnidirectionalSequenceLstmQueueDescriptor>(descriptor, info) , m_InputToInputWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToInputWeights)) , m_InputToForgetWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToForgetWeights)) , m_InputToCellWeightsTensor (AssignScopedTensorHandle(descriptor.m_InputToCellWeights)) diff --git a/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.hpp b/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.hpp index d0c000f20d..7a91cee642 100644 --- a/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.hpp +++ b/src/backends/reference/workloads/RefUnidirectionalSequenceLstmWorkload.hpp @@ -7,7 +7,7 @@ #include <armnn/TypesUtils.hpp> -#include <armnn/backends/Workload.hpp> +#include "RefBaseWorkload.hpp" #include <armnn/backends/WorkloadData.hpp> #include "Encoders.hpp" @@ -16,7 +16,7 @@ namespace armnn { -class RefUnidirectionalSequenceLstmWorkload : public BaseWorkload<UnidirectionalSequenceLstmQueueDescriptor> +class RefUnidirectionalSequenceLstmWorkload : public RefBaseWorkload<UnidirectionalSequenceLstmQueueDescriptor> { public: explicit RefUnidirectionalSequenceLstmWorkload(const UnidirectionalSequenceLstmQueueDescriptor& descriptor, |