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 /1.2 | |
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 '1.2')
-rw-r--r-- | 1.2/HalPolicy.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index d599fef8..0a12fd24 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -172,10 +172,6 @@ bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, Co 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 @@ bool HalPolicy::ConvertResize(const Operation& operation, 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; |