From d30093c755b7e4e354eb537272876ec95b0eddc9 Mon Sep 17 00:00:00 2001 From: Ferran Balaguer Date: Tue, 9 Jul 2019 17:04:47 +0100 Subject: IVGCVSW-3477 Refactor android-nn-driver to use armnn ILayerSupported !armnn:1508 Signed-off-by: Ferran Balaguer Change-Id: Ica5fcb683f101bde9e651f0be0f5b9b4c409d1aa --- ConversionUtils.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'ConversionUtils.cpp') diff --git a/ConversionUtils.cpp b/ConversionUtils.cpp index fb71c759..f513d28f 100644 --- a/ConversionUtils.cpp +++ b/ConversionUtils.cpp @@ -150,12 +150,15 @@ armnn::IConnectableLayer* ProcessActivation(const armnn::TensorInfo& tensorInfo, } } - 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; } -- cgit v1.2.1