commit d30093c755b7e4e354eb537272876ec95b0eddc9
author Ferran Balaguer <ferran.balaguer@arm.com> Tue Jul 09 17:04:47 2019 +0100
committer Ferran Balaguer Arm <ferran.balaguer@arm.com> Tue Jul 16 10:51:00 2019 +0000
tree 6833f21c56a76f16fc7001eb784ccd7b20cb3aef
parent 95b1ef62568cc71b4bcdde6af02b26687d020a1e

IVGCVSW-3477 Refactor android-nn-driver to use armnn ILayerSupported

!armnn:1508

Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: Ica5fcb683f101bde9e651f0be0f5b9b4c409d1aa

ConversionUtils.cpp

diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp
index fb71c75..f513d28 100644
--- a/ConversionUtils.cpp
+++ b/ConversionUtils.cpp
@@ -150,12 +150,15 @@
             }
         }
 
-        if (!IsLayerSupportedForAnyBackend(__func__,
-                                           armnn::IsActivationSupported,
-                                           data.m_Backends,
-                                           prevLayer->GetOutputSlot(0).GetTensorInfo(),
-                                           tensorInfo,
-                                           activationDesc))
+        bool isSupported = false;
+        FORWARD_LAYER_SUPPORT_FUNC(__func__,
+                                   IsActivationSupported,
+                                   data.m_Backends,
+                                   isSupported,
+                                   prevLayer->GetOutputSlot(0).GetTensorInfo(),
+                                   tensorInfo,
+                                   activationDesc);
+        if (!isSupported)
         {
             return nullptr;
         }