From c394a6d17008f876c73e94883f0c59aeedfe73f0 Mon Sep 17 00:00:00 2001 From: Matthew Bentham Date: Mon, 24 Jun 2019 12:51:25 +0100 Subject: IVGCVSW-3307 Don't assume TensorInfo::Map() can be called before Execute() Change-Id: I445c69d2e99d8c93622e739af61f721e61b0f90f Signed-off-by: Matthew Bentham --- src/backends/reference/workloads/RefConvolution2dWorkload.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/backends/reference/workloads/RefConvolution2dWorkload.cpp') diff --git a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp index a660d2e7f4..dad9936f1b 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp @@ -34,16 +34,19 @@ void RefConvolution2dWorkload::PostAllocationConfigure() { const TensorInfo& inputInfo = GetTensorInfo(m_Data.m_Inputs[0]); m_InputShape = inputInfo.GetShape(); - m_InputDecoder = MakeDecoder(inputInfo, m_Data.m_Inputs[0]->Map()); + m_InputDecoder = MakeDecoder(inputInfo); const TensorInfo& outputInfo = GetTensorInfo(m_Data.m_Outputs[0]); m_OutputShape = outputInfo.GetShape(); - m_OutputEncoder = MakeEncoder(outputInfo, m_Data.m_Outputs[0]->Map()); + m_OutputEncoder = MakeEncoder(outputInfo); } void RefConvolution2dWorkload::Execute() const { ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefConvolution2dWorkload_Execute"); + m_InputDecoder->Reset(m_Data.m_Inputs[0]->Map()); + m_OutputEncoder->Reset(m_Data.m_Outputs[0]->Map()); + Convolve(m_InputShape, *m_InputDecoder, m_OutputShape, *m_OutputEncoder, m_FilterShape, *m_FilterDecoder, m_Data.m_Parameters.m_BiasEnabled, m_BiasDecoder.get(), m_Data.m_Parameters.m_DataLayout, m_Data.m_Parameters.m_PadTop, m_Data.m_Parameters.m_PadLeft, -- cgit v1.2.1