From c7d0d44812336f4db8ab9a649fb40b4d4ed27e97 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Wed, 11 Dec 2019 19:27:11 +0000 Subject: Catch std::exception instead of armnn::Exception Signed-off-by: Derek Lamberti 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 MLCE-144 Cts NNAPI test cases failed * Fixed numerous CTS/VTS failures related to Quantization !armnn:2457 Signed-off-by: Mike Kelly MLCE-144 Fix 2d pooling convert function Signed-off-by: FinnWilliamsArm Change-Id: I054635ebfd52cb5575490c3bfaae0104eb1685cc --- 1.2/HalPolicy.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '1.2/HalPolicy.cpp') diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index e08ae84f..0a12fd24 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -317,6 +317,12 @@ bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& { 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; -- cgit v1.2.1