diff options
author | James Conroy <james.conroy@arm.com> | 2019-11-18 17:07:43 +0000 |
---|---|---|
committer | James Conroy <james.conroy@arm.com> | 2019-11-19 12:51:55 +0000 |
commit | 47e863dce36d9722ece3c4ceeb59c548edbb8e4f (patch) | |
tree | 2c8d41b93927b955c757f8241e73a54b90651a0b /src/armnn | |
parent | 85ad78c1d44b749ad7a1d09c26c3d7f7f35a3f3d (diff) | |
download | armnn-47e863dce36d9722ece3c4ceeb59c548edbb8e4f.tar.gz |
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 <james.conroy@arm.com>
Change-Id: Ief42b3c52d018f0fa71be4d4d37516f2caad1e0d
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/Network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |