Catch std::exception instead of armnn::Exception
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
MLCE-143 Fix for reference implementation for service stopping when running CTS.
*ConvertDepthwise reports that weights are not supported with the first dimension of the tensor is not 1
*ConvertConcat was missing one case for reporting unsupported inputs.
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
MLCE-144 Cts NNAPI test cases failed
* Fixed numerous CTS/VTS failures related to Quantization
!armnn:2457
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
MLCE-144 Fix 2d pooling convert function
Signed-off-by: FinnWilliamsArm <Finn.Williams@Arm.com>
Change-Id: I054635ebfd52cb5575490c3bfaae0104eb1685cc
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index e08ae84..0a12fd2 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -317,6 +317,12 @@
{
return Fail("%s: Operand is invalid", __func__);
}
+ if ( weightsOperand->dimensions[0] != 1)
+ {
+ return Fail("%s: Invalid weights; for depthwise convolution, dimension 0 must be 1 but it is %i",
+ __func__, weightsOperand->dimensions[0] );
+ }
+
armnn::DepthwiseConvolution2dDescriptor desc;
desc.m_DataLayout = armnn::DataLayout::NHWC;