From 47e863dce36d9722ece3c4ceeb59c548edbb8e4f Mon Sep 17 00:00:00 2001 From: James Conroy Date: Mon, 18 Nov 2019 17:07:43 +0000 Subject: IVGCVSW-4077 Fix issue when NEON import disabled * Removes workaround which handled null dstFactory when NEON import was disabled, and now handles this in the correct way. Signed-off-by: James Conroy Change-Id: Ief42b3c52d018f0fa71be4d4d37516f2caad1e0d --- src/armnn/Network.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/armnn/Network.cpp') diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 1797baf78e..d16475947d 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -708,9 +708,9 @@ EdgeStrategy CalculateEdgeStrategy(BackendsMap& backends, { ITensorHandleFactory* dstFactory = registry.GetFactory(pref); - // Handles some cases where dstFactory is null when Neon memory import is disabled + // Handles cases when a destPref is not listed in TensorHandleFactoryRegistry if (!dstFactory) { - return EdgeStrategy::CopyToTarget; + continue; } if ((dstFactory->GetImportFlags() & srcFactory->GetExportFlags()) != 0) @@ -726,7 +726,7 @@ EdgeStrategy CalculateEdgeStrategy(BackendsMap& backends, for (auto&& pref : dstPrefs) { ITensorHandleFactory* dstFactory = registry.GetFactory(pref); - if (dstFactory->SupportsMapUnmap()) + if (dstFactory && dstFactory->SupportsMapUnmap()) { return EdgeStrategy::CopyToTarget; } -- cgit v1.2.1