From c7d0d44812336f4db8ab9a649fb40b4d4ed27e97 Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Wed, 11 Dec 2019 19:27:11 +0000
Subject: 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
---
 ArmnnDriverImpl.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ArmnnDriverImpl.cpp')

diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 64188bbf..d5fa9784 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -108,10 +108,10 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
                                  OptOptions,
                                  errMessages);
     }
-    catch (armnn::Exception &e)
+    catch (std::exception& e)
     {
         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;
     }
@@ -142,10 +142,10 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
             return FailPrepareModel(ErrorStatus::GENERAL_FAILURE, "Network could not be loaded", cb);
         }
     }
-    catch (armnn::Exception& e)
+    catch (std::exception& e)
     {
         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;
     }
@@ -173,7 +173,7 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
         {
             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());
-- 
cgit v1.2.1