From ffab16f9f23868b5b9338a1b63393f3be53211cb Mon Sep 17 00:00:00 2001 From: James Conroy Date: Thu, 7 Nov 2019 14:37:09 +0000 Subject: IVGCVSW-4077 Disable NEON memory import * Temporarily handles cases in CalculateEdgeStrategy where dstFactory pointer is null when import is disabled. * This patch is required for ensuring debug layer works correctly when executing a model on Neon. Signed-off-by: James Conroy Change-Id: I7304723246d362d6d9073c3d0b1224e194a8532c --- src/armnn/Network.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/armnn/Network.cpp') diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index f4bfc7a88e..b1cb5a871a 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -699,6 +699,12 @@ EdgeStrategy CalculateEdgeStrategy(BackendsMap& backends, for (auto&& pref : dstPrefs) { ITensorHandleFactory* dstFactory = registry.GetFactory(pref); + + // Handles some cases where dstFactory is null when Neon memory import is disabled + if (!dstFactory) { + return EdgeStrategy::CopyToTarget; + } + if ((dstFactory->GetImportFlags() & srcFactory->GetExportFlags()) != 0) { return EdgeStrategy::ExportToTarget; -- cgit v1.2.1