From 03eff13df185345f2b6648a223230d2861410817 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 10 Jan 2020 17:29:51 +0000 Subject: IVGCVSW-4241 Reenabling support for NCHW. * Reenabling support for NCHW for Convolution, Pooling and Resize. Signed-off-by: Mike Kelly Change-Id: I6ceb1ab0983e19d200ba353b0017b0f0cd1628e0 --- 1.2/HalPolicy.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to '1.2/HalPolicy.cpp') diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index d599fef8..0a12fd24 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -172,10 +172,6 @@ bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, Co desc.m_DataLayout = OptionalDataLayout(operation, 10, model, data); } - if (desc.m_DataLayout == armnn::DataLayout::NCHW) - { - return Fail("%s: Operation has invalid inputs NCHW is not supported", __func__); - } const armnn::PermutationVector OHWIToOIHW = {0, 2, 3, 1}; // ArmNN does not currently support non-fixed weights or bias @@ -1086,11 +1082,6 @@ bool HalPolicy::ConvertResize(const Operation& operation, descriptor.m_Method = resizeMethod; descriptor.m_DataLayout = OptionalDataLayout(operation, 3, model, data); - if (descriptor.m_DataLayout == armnn::DataLayout::NCHW) - { - return Fail("%s: Operation has invalid inputs NCHW is not supported", __func__); - } - OperandType operandType1; OperandType operandType2; -- cgit v1.2.1