IVGCVSW-5766 Avoiding driver abort when Cts tests use invalid filter shape.
* A number of DepthwiseConv2d Cts tests pass a filter operand with a
dimension[0] value greater than 1 in contravention of Android
documentation. Adding a check to handle this gracefully.
* Changing a hard assert in ConversionUtils::ConstTensorPin to a warning.
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I605340d098b717d1d88d259a0ed89a801287764d
diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp
index b03ffbd..9cc6e28 100644
--- a/ConversionUtils.cpp
+++ b/ConversionUtils.cpp
@@ -62,7 +62,10 @@
const armnn::PermutationVector& mappings)
{
armnn::IgnoreUnused(numBytes);
- assert(tensorInfo.GetNumBytes() == numBytes);
+ if (tensorInfo.GetNumBytes() != numBytes)
+ {
+ ALOGW("The size of ConstTensor does not match its TensorInfo.");
+ }
const bool needsSwizzling = (mappings.GetSize() > 0);
if (needsSwizzling)