diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2020-01-10 17:29:51 +0000 |
|---|---|---|
| committer | Kevin May <kevin.may@arm.com> | 2020-01-15 19:57:01 +0000 |
| commit | 03eff13df185345f2b6648a223230d2861410817 (patch) | |
| tree | f3ebca8934aa99968477fe5fc7bb29e474f2598c /ConversionUtils.hpp | |
| parent | 20e8916bee2a9ddb84ee61daf56fefd9c624cfbc (diff) | |
| download | android-nn-driver-03eff13df185345f2b6648a223230d2861410817.tar.gz | |
IVGCVSW-4241 Reenabling support for NCHW.v19.08.1branches/android-nn-driver_19_08
* Reenabling support for NCHW for Convolution, Pooling and Resize.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I6ceb1ab0983e19d200ba353b0017b0f0cd1628e0
Diffstat (limited to 'ConversionUtils.hpp')
| -rw-r--r-- | ConversionUtils.hpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index acf215d5..8dcf3524 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); |