From b8181f72b8c7c9132373dbcf7f8709ec2c0f23c0 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Wed, 7 Apr 2021 10:23:21 +0100 Subject: IVGCVSW-5787 Add/Update Execute() implementations in RefActivationWorkload * Added multithreaded StridedSliceEndToEndTest Signed-off-by: Finn Williams Change-Id: I4579db7b5959e0a22256f1bda00238c22e611dec --- .../workloads/RefConvolution2dWorkload.cpp | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 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 dad9936f1b..6d0ab413d8 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp @@ -30,24 +30,26 @@ RefConvolution2dWorkload::RefConvolution2dWorkload( } } -void RefConvolution2dWorkload::PostAllocationConfigure() +void RefConvolution2dWorkload::Execute() const { - const TensorInfo& inputInfo = GetTensorInfo(m_Data.m_Inputs[0]); - m_InputShape = inputInfo.GetShape(); - m_InputDecoder = MakeDecoder(inputInfo); + Execute(m_Data.m_Inputs, m_Data.m_Outputs); +} - const TensorInfo& outputInfo = GetTensorInfo(m_Data.m_Outputs[0]); - m_OutputShape = outputInfo.GetShape(); - m_OutputEncoder = MakeEncoder(outputInfo); +void RefConvolution2dWorkload::ExecuteAsync(WorkingMemDescriptor &workingMemDescriptor) +{ + Execute(workingMemDescriptor.m_Inputs, workingMemDescriptor.m_Outputs); } -void RefConvolution2dWorkload::Execute() const { +void RefConvolution2dWorkload::Execute(std::vector inputs, std::vector outputs) 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()); + std::unique_ptr> inputDecoder = MakeDecoder(GetTensorInfo(inputs[0]), inputs[0]->Map()); + std::unique_ptr> outputEncoder = MakeEncoder(GetTensorInfo(outputs[0]), outputs[0]->Map()); + + const TensorShape& inputShape = GetTensorInfo(inputs[0]).GetShape(); + const TensorShape& outputShape = GetTensorInfo(outputs[0]).GetShape(); - Convolve(m_InputShape, *m_InputDecoder, m_OutputShape, *m_OutputEncoder, m_FilterShape, + Convolve(inputShape, *inputDecoder, outputShape, *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, m_Data.m_Parameters.m_StrideX, m_Data.m_Parameters.m_StrideY, -- cgit v1.2.1