aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kelly <mike.kelly@arm.com>2020-01-10 17:29:51 +0000
committerKevin May <kevin.may@arm.com>2020-01-15 19:57:01 +0000
commit03eff13df185345f2b6648a223230d2861410817 (patch)
treef3ebca8934aa99968477fe5fc7bb29e474f2598c
parent20e8916bee2a9ddb84ee61daf56fefd9c624cfbc (diff)
downloadandroid-nn-driver-branches/android-nn-driver_19_08.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
-rw-r--r--1.2/HalPolicy.cpp9
-rw-r--r--ConversionUtils.hpp10
2 files changed, 0 insertions, 19 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index d599fef..0a12fd2 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;
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index acf215d..8dcf352 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);