diff options
Diffstat (limited to 'ConversionUtils.hpp')
| -rw-r--r-- | ConversionUtils.hpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 38253b0a..0cca619e 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -181,7 +181,6 @@ inline bool IsOperandTypeSupportedForTensors(V1_0::OperandType type) inline bool IsOperandTypeSupportedForTensors(V1_2::OperandType type) { return type == V1_2::OperandType::BOOL || - type == V1_2::OperandType::TENSOR_FLOAT16 || type == V1_2::OperandType::TENSOR_FLOAT32 || type == V1_2::OperandType::TENSOR_QUANT8_ASYMM || type == V1_2::OperandType::TENSOR_QUANT16_SYMM || @@ -1430,6 +1429,11 @@ 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 @@ -1449,6 +1453,11 @@ 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); @@ -3205,6 +3214,11 @@ bool ConvertBatchToSpaceNd(const HalOperation& operation, if (Is12Operand(*output)) { batchToSpaceNdDesc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 2, model, data); + + if (batchToSpaceNdDesc.m_DataLayout == armnn::DataLayout::NCHW) + { + return Fail("%s: Operation has invalid inputs NCHW is not supported", __func__); + } } // Setting crops to 0,0 0,0 as it is not supported in Android NN API batchToSpaceNdDesc.m_Crops = {{0, 0}, {0, 0}}; @@ -3307,6 +3321,11 @@ bool ConvertSpaceToBatchNd(const HalOperation& operation, const HalModel& model, if (Is12Operand(*output)) { descriptor.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 3, model, data); + + if (descriptor.m_DataLayout == armnn::DataLayout::NCHW) + { + return Fail("%s: Operation has invalid inputs NCHW is not supported", __func__); + } } bool isSupported = false; |