diff options
author | Finn Williams <finn.williams@arm.com> | 2022-05-18 13:24:14 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-05-18 13:06:42 +0000 |
commit | d0420cb62b71f9c015d2b0e889011899051e56c0 (patch) | |
tree | 9cf931497ff0f4336a59b91db29cd5c3d7ebf438 /src/backends/reference/workloads/RefConvolution2dWorkload.cpp | |
parent | aeb4a9c8ecc0707e0d82f886c07b300fe00920dc (diff) | |
download | armnn-d0420cb62b71f9c015d2b0e889011899051e56c0.tar.gz |
Remove use of PostAllocationConfigure from ExecuteAsync calls
* Resolves: IVGCVSW-6952
Signed-off-by: Finn Williams <finn.williams@arm.com>
Change-Id: Ic85bd5267cf94e0ee8461ff4e62b9db3cb80877a
Diffstat (limited to 'src/backends/reference/workloads/RefConvolution2dWorkload.cpp')
-rw-r--r-- | src/backends/reference/workloads/RefConvolution2dWorkload.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp index fe97cb1066..3ddbdcebca 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp @@ -15,6 +15,9 @@ namespace armnn RefConvolution2dWorkload::RefConvolution2dWorkload(const Convolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) : RefBaseWorkload<Convolution2dQueueDescriptor>(descriptor, info) + , m_InputShape(info.m_InputTensorInfos[0].GetShape()) + , m_FilterShape(info.m_InputTensorInfos[1].GetShape()) + , m_OutputShape(info.m_OutputTensorInfos[0].GetShape()) { WorkloadInfo detailsInfo; detailsInfo.m_InputTensorInfos = info.m_InputTensorInfos; @@ -27,33 +30,6 @@ RefConvolution2dWorkload::RefConvolution2dWorkload(const Convolution2dQueueDescr this->GetGuid()); } -void RefConvolution2dWorkload::PostAllocationConfigure() -{ - PostAllocationConfigure(m_Data.m_Inputs, m_Data.m_Outputs); -} - -void RefConvolution2dWorkload::PostAllocationConfigure(std::vector<ITensorHandle*> inputs, - std::vector<ITensorHandle*> outputs) -{ - const TensorInfo& inputInfo = GetTensorInfo(inputs[0]); - ARMNN_ASSERT(inputInfo.GetNumDimensions() > 1); - m_InputShape = inputInfo.GetShape(); - - const TensorInfo& rFilterInfo = GetTensorInfo(inputs[1]); - ARMNN_ASSERT(inputInfo.GetNumDimensions() > 1); - m_FilterShape = rFilterInfo.GetShape(); - m_FilterDecoder = MakeDecoder<float>(rFilterInfo); - - if (m_Data.m_Parameters.m_BiasEnabled) - { - const TensorInfo& biasInfo = GetTensorInfo(inputs[2]); - m_BiasDecoder = MakeDecoder<float>(biasInfo); - } - - const TensorInfo& outputInfo = GetTensorInfo(outputs[0]); - m_OutputShape = outputInfo.GetShape(); -} - void RefConvolution2dWorkload::Execute() const { Execute(m_Data.m_Inputs, m_Data.m_Outputs); @@ -61,8 +37,6 @@ void RefConvolution2dWorkload::Execute() const void RefConvolution2dWorkload::ExecuteAsync(WorkingMemDescriptor& workingMemDescriptor) { - PostAllocationConfigure(workingMemDescriptor.m_Inputs, workingMemDescriptor.m_Outputs); - Execute(workingMemDescriptor.m_Inputs, workingMemDescriptor.m_Outputs); } @@ -73,14 +47,16 @@ void RefConvolution2dWorkload::Execute(std::vector<ITensorHandle*> inputs, std:: std::unique_ptr<Decoder<float>> inputDecoder = MakeDecoder<float>(GetTensorInfo(inputs[0]), inputs[0]->Map()); std::unique_ptr<Encoder<float>> outputEncoder = MakeEncoder<float>(GetTensorInfo(outputs[0]), outputs[0]->Map()); - m_FilterDecoder->Reset(inputs[1]->Map()); + std::unique_ptr<Decoder<float>> weightsDecoder = MakeDecoder<float>(GetTensorInfo(inputs[1]), inputs[1]->Map()); + std::unique_ptr<Decoder<float>> biasDecoder; + if (m_Data.m_Parameters.m_BiasEnabled) { - m_BiasDecoder->Reset(inputs[2]->Map()); + biasDecoder = MakeDecoder<float>(GetTensorInfo(inputs[2]), inputs[2]->Map()); } Convolve(m_InputShape, *inputDecoder, m_OutputShape, *outputEncoder, m_FilterShape, - *m_FilterDecoder, m_Data.m_Parameters.m_BiasEnabled, m_BiasDecoder.get(), + *weightsDecoder, m_Data.m_Parameters.m_BiasEnabled, biasDecoder.get(), m_Data.m_Parameters.m_DataLayout, m_Data.m_Parameters.m_PadTop, m_Data.m_Parameters.m_PadLeft, m_Data.m_Parameters.m_StrideX, m_Data.m_Parameters.m_StrideY, m_Data.m_Parameters.m_DilationX, m_Data.m_Parameters.m_DilationY); |