diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-14 15:44:18 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-14 14:42:59 +0000 |
| commit | 04a729708f986b1a69c1efc42d5cf18271cfae1e (patch) | |
| tree | d39be642c3b5bfe9f9520ae69889b20dade10406 /src/backends/cl/workloads/ClConvolution2dWorkload.cpp | |
| parent | 80c6b146046252af153af27025a28fb59d33c5e6 (diff) | |
| download | armnn-04a729708f986b1a69c1efc42d5cf18271cfae1e.tar.gz | |
IVGCVSW-5157 'Pipe ModelOption through Network::LoadNetwork() to Workload factory'
* Pass ModelOptions to WorkloadFactory
* Updated signature of CL and NEON Convolution2d workloads added FastMathEnabled param.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I536178be8e4dd4083489e69febadaf0feeba46d2
Diffstat (limited to 'src/backends/cl/workloads/ClConvolution2dWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClConvolution2dWorkload.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp index 42c9903dc4..7b52f2784f 100644 --- a/src/backends/cl/workloads/ClConvolution2dWorkload.cpp +++ b/src/backends/cl/workloads/ClConvolution2dWorkload.cpp @@ -59,7 +59,9 @@ arm_compute::Status ClConvolution2dWorkloadValidate(const TensorInfo& input, } ClConvolution2dWorkload::ClConvolution2dWorkload(const Convolution2dQueueDescriptor& descriptor, - const WorkloadInfo& info, std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager) + const WorkloadInfo& info, + std::shared_ptr<arm_compute::MemoryManagerOnDemand>& memoryManager, + const bool isFastMathEnabled) : BaseWorkload<Convolution2dQueueDescriptor>(descriptor, info) , m_ConvolutionLayer(memoryManager) { @@ -95,7 +97,20 @@ ClConvolution2dWorkload::ClConvolution2dWorkload(const Convolution2dQueueDescrip &output, padStrideInfo, arm_compute::WeightsInfo(), - aclDilationInfo); + aclDilationInfo, + arm_compute::ActivationLayerInfo(), + isFastMathEnabled); + + m_ConvolutionMethod = + m_ConvolutionLayer.get_convolution_method(input.info(), + m_KernelTensor->info(), + output.info(), + padStrideInfo, + arm_compute::WeightsInfo(), + arm_compute::ActivationLayerInfo(), + arm_compute::CLScheduler::get().target(), + aclDilationInfo, + isFastMathEnabled); InitializeArmComputeClTensorData(*m_KernelTensor, m_Data.m_Weight); @@ -116,6 +131,11 @@ void ClConvolution2dWorkload::Execute() const RunClFunction(m_ConvolutionLayer, CHECK_LOCATION()); } +arm_compute::ConvolutionMethod ClConvolution2dWorkload::GetConvolutionMethod() const +{ + return m_ConvolutionMethod; +} + void ClConvolution2dWorkload::FreeUnusedTensors() { FreeTensorIfUnused(m_KernelTensor); |