diff options
| author | James Conroy <james.conroy@arm.com> | 2018-10-11 12:39:05 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:53 +0100 |
| commit | 595408218a0e17f04d91ff131a8227a4f352ff61 (patch) | |
| tree | 515316e28abbed3dce388bc99be5ff52bc042765 /src/backends/WorkloadData.cpp | |
| parent | a0944791e87902b35e06c306c7b1a6f0f5bbfbd7 (diff) | |
| download | armnn-595408218a0e17f04d91ff131a8227a4f352ff61.tar.gz | |
IVGCVSW-1978: Support NHWC for ResizeBilinear CpuRef
* Adds implementation to plumb DataLayout parameter
for ResizeBilinear on CpuRef.
* Adds unit tests to execute ResizeBilinear on CpuRef
using the NHWC data layout.
* Adds DataLayoutIndexed API, allowing easy access to
the Channels, Height and Width of a tensor based on
its data layout. This reduces code duplication.
* Refactors original ResizeBilinear implementation and
tests to use the DataLayoutIndexed API when required.
Change-Id: Ic2b8916cdd2e370d070175547079d774daf6d7bf
Diffstat (limited to 'src/backends/WorkloadData.cpp')
| -rw-r--r-- | src/backends/WorkloadData.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/backends/WorkloadData.cpp b/src/backends/WorkloadData.cpp index a6a87f3782..d562b73053 100644 --- a/src/backends/WorkloadData.cpp +++ b/src/backends/WorkloadData.cpp @@ -663,11 +663,10 @@ void ResizeBilinearQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) c } { - // DataLayout is NCHW by default (channelsIndex = 1) - const unsigned int channelsIndex = this->m_Parameters.m_DataLayout == armnn::DataLayout::NHWC ? 3 : 1; - - const unsigned int inputChannelCount = workloadInfo.m_InputTensorInfos[0].GetShape()[channelsIndex]; - const unsigned int outputChannelCount = workloadInfo.m_OutputTensorInfos[0].GetShape()[channelsIndex]; + const unsigned int inputChannelCount = + workloadInfo.m_InputTensorInfos[0].GetShape()[this->m_Parameters.m_DataLayout.GetChannelsIndex()]; + const unsigned int outputChannelCount = + workloadInfo.m_OutputTensorInfos[0].GetShape()[this->m_Parameters.m_DataLayout.GetChannelsIndex()]; if (inputChannelCount != outputChannelCount) { throw InvalidArgumentException( |