diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-12-11 19:27:11 +0000 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-12-11 19:27:11 +0000 |
| commit | c7d0d44812336f4db8ab9a649fb40b4d4ed27e97 (patch) | |
| tree | 6dc06685a5e6f9458b1b063360e854f76b803b10 /1.2 | |
| parent | 1df647726b9f5a1bb725e13919f1f7fa506865c9 (diff) | |
| download | android-nn-driver-c7d0d44812336f4db8ab9a649fb40b4d4ed27e97.tar.gz | |
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
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/ArmnnDriverImpl.cpp | 10 | ||||
| -rw-r--r-- | 1.2/HalPolicy.cpp | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp index 8a444e5d..0d54c7ff 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -127,10 +127,10 @@ Return<ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime OptOptions, errMessages); } - catch (armnn::Exception &e) + catch (std::exception& e) { std::stringstream message; - message << "armnn::Exception (" << e.what() << ") caught from optimize."; + message << "Exception (" << e.what() << ") caught from optimize."; FailPrepareModel(ErrorStatus::GENERAL_FAILURE, message.str(), cb); return ErrorStatus::NONE; } @@ -162,10 +162,10 @@ Return<ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime return FailPrepareModel(ErrorStatus::GENERAL_FAILURE, "Network could not be loaded", cb); } } - catch (armnn::Exception& e) + catch (std::exception& e) { std::stringstream message; - message << "armnn::Exception (" << e.what()<< ") caught from LoadNetwork."; + message << "Exception (" << e.what() << ") caught from LoadNetwork."; FailPrepareModel(ErrorStatus::GENERAL_FAILURE, message.str(), cb); return ErrorStatus::NONE; } @@ -193,7 +193,7 @@ Return<ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime { clTunedParameters->Save(options.GetClTunedParametersFile().c_str()); } - catch (const armnn::Exception& error) + catch (std::exception& error) { ALOGE("ArmnnDriverImpl::prepareModel: Failed to save CL tuned parameters file '%s': %s", options.GetClTunedParametersFile().c_str(), error.what()); 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; |