Revert "IVGCVSW-4305 - Re-enable NCHW on Pooling2D"
This reverts commit b3680df4298a2f4d4ef8b637f35c3bc343b05339.
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Iad15bb7360817eb91428681c05cfb065e317b4d0
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 18b97f6..afaf1af 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1430,6 +1430,11 @@
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
@@ -1449,6 +1454,11 @@
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);