commit 03eff13df185345f2b6648a223230d2861410817
author Mike Kelly <mike.kelly@arm.com> Fri Jan 10 17:29:51 2020 +0000
committer Kevin May <kevin.may@arm.com> Wed Jan 15 19:57:01 2020 +0000
tree f3ebca8934aa99968477fe5fc7bb29e474f2598c
parent 20e8916bee2a9ddb84ee61daf56fefd9c624cfbc

IVGCVSW-4241 Reenabling support for NCHW.

 * Reenabling support for NCHW for Convolution, Pooling and Resize.

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I6ceb1ab0983e19d200ba353b0017b0f0cd1628e0

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index d599fef..0a12fd2 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -172,10 +172,6 @@
         desc.m_DataLayout = OptionalDataLayout<hal_1_2::HalPolicy>(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 @@
     descriptor.m_Method     = resizeMethod;
     descriptor.m_DataLayout = OptionalDataLayout<hal_1_2::HalPolicy>(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;
 

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index acf215d..8dcf352 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1430,11 +1430,6 @@
         if (Is12Operand(*output))
         {
             desc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 10, model, data);
-
-            if (desc.m_DataLayout == armnn::DataLayout::NCHW)
-            {
-                return Fail("%s: Operation has invalid inputs NCHW is not supported", operationName);
-            }
         }
     }
     else
@@ -1454,11 +1449,6 @@
         if (Is12Operand(*output))
         {
             desc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 7, model, data);
-
-            if (desc.m_DataLayout == armnn::DataLayout::NCHW)
-            {
-                return Fail("%s: Operation has invalid inputs NCHW is not supported", operationName);
-            }
         }
 
         const armnnUtils::DataLayoutIndexed dataLayout(desc.m_DataLayout);