diff options
| -rw-r--r-- | 1.2/HalPolicy.cpp | 9 | ||||
| -rw-r--r-- | ConversionUtils.hpp | 10 |
2 files changed, 0 insertions, 19 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; 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); |