From 05355b95d96318c9cb70baf84ee803442e11885f Mon Sep 17 00:00:00 2001 From: Kevin May Date: Fri, 20 Dec 2019 11:38:07 +0000 Subject: Revert "IVGCVSW-4305 - Re-enable NCHW on Pooling2D" This reverts commit b3680df4298a2f4d4ef8b637f35c3bc343b05339. Signed-off-by: Kevin May Change-Id: Iad15bb7360817eb91428681c05cfb065e317b4d0 --- ConversionUtils.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 18b97f6e..afaf1af7 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -1430,6 +1430,11 @@ bool ConvertPooling2d(const HalOperation& operation, if (Is12Operand(*output)) { 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", operationName); + } } } else @@ -1449,6 +1454,11 @@ bool ConvertPooling2d(const HalOperation& operation, if (Is12Operand(*output)) { desc.m_DataLayout = OptionalDataLayout(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); -- cgit v1.2.1