aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin May <kevin.may@arm.com>2019-12-19 17:49:24 +0000
committerKevin May <kevin.may@arm.com>2019-12-19 17:49:24 +0000
commitb3680df4298a2f4d4ef8b637f35c3bc343b05339 (patch)
tree81dda751d072479a5bf6019674a95fab1f1f06b6
parent57ea6d15d3d32d263192e94bc67302e96cf1178f (diff)
downloadandroid-nn-driver-b3680df4298a2f4d4ef8b637f35c3bc343b05339.tar.gz
IVGCVSW-4305 - Re-enable NCHW on Pooling2D
Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: I85ed84b818c15f402b220f223fb9e728e08dceed
-rw-r--r--ConversionUtils.hpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index afaf1af7..18b97f6e 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1430,11 +1430,6 @@ bool ConvertPooling2d(const HalOperation& operation,
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 @@ bool ConvertPooling2d(const HalOperation& operation,
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);