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 --- ArmnnDevice.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ArmnnDevice.cpp') diff --git a/ArmnnDevice.cpp b/ArmnnDevice.cpp index a03d9cc9..34019c32 100644 --- a/ArmnnDevice.cpp +++ b/ArmnnDevice.cpp @@ -64,7 +64,7 @@ ArmnnDevice::ArmnnDevice(DriverOptions options) { m_ClTunedParameters->Load(m_Options.GetClTunedParametersFile().c_str()); } - catch (const armnn::Exception& error) + catch (std::exception& error) { // This is only a warning because the file won't exist the first time you are generating it. ALOGW("ArmnnDevice: Failed to load CL tuned parameters file '%s': %s", @@ -77,6 +77,10 @@ ArmnnDevice::ArmnnDevice(DriverOptions options) { ALOGE("ArmnnDevice: Failed to setup CL runtime: %s. Device will be unavailable.", error.what()); } + catch (std::exception& error) + { + ALOGE("ArmnnDevice: Unknown exception: %s. Device will be unavailable.", error.what()); + } #endif runtimeOptions.m_EnableGpuProfiling = m_Options.IsGpuProfilingEnabled(); m_Runtime = armnn::IRuntime::Create(runtimeOptions); -- cgit v1.2.1