From 57d10b7f976b4eddee64e15d563bd040f3331702 Mon Sep 17 00:00:00 2001 From: James Conroy Date: Fri, 25 Oct 2019 09:44:14 +0100 Subject: IVGCVSW-3962 Return 0 for Neon GetExportFlags() * Fixes issue where MemImport workload was being inserted into a graph when changing from a NEON to Ref workload. A MemCopy will now be performed instead. * Improves existing ImportAlignedPointerTest by adding check for expected output. Signed-off-by: James Conroy Change-Id: I606dbbe0166731c62fbe4cc1966c558ade66d6bb --- src/backends/neon/NeonTensorHandleFactory.cpp | 8 ++++---- src/backends/neon/NeonTensorHandleFactory.hpp | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/backends/neon') diff --git a/src/backends/neon/NeonTensorHandleFactory.cpp b/src/backends/neon/NeonTensorHandleFactory.cpp index 4ccbb7b64f..80f46d2237 100644 --- a/src/backends/neon/NeonTensorHandleFactory.cpp +++ b/src/backends/neon/NeonTensorHandleFactory.cpp @@ -60,7 +60,7 @@ std::unique_ptr NeonTensorHandleFactory::CreateTensorHandle(const } // If we are not Managing the Memory then we must be importing tensorHandle->SetImportEnabledFlag(!IsMemoryManaged); - tensorHandle->SetImportFlags(m_ImportFlags); + tensorHandle->SetImportFlags(GetImportFlags()); return tensorHandle; } @@ -76,7 +76,7 @@ std::unique_ptr NeonTensorHandleFactory::CreateTensorHandle(const } // If we are not Managing the Memory then we must be importing tensorHandle->SetImportEnabledFlag(!IsMemoryManaged); - tensorHandle->SetImportFlags(m_ImportFlags); + tensorHandle->SetImportFlags(GetImportFlags()); return tensorHandle; } @@ -99,12 +99,12 @@ bool NeonTensorHandleFactory::SupportsSubTensors() const MemorySourceFlags NeonTensorHandleFactory::GetExportFlags() const { - return m_ExportFlags; + return 0; } MemorySourceFlags NeonTensorHandleFactory::GetImportFlags() const { - return m_ImportFlags; + return static_cast(MemorySource::Malloc); } } // namespace armnn diff --git a/src/backends/neon/NeonTensorHandleFactory.hpp b/src/backends/neon/NeonTensorHandleFactory.hpp index d9b64045e6..8a8ac5cdcb 100644 --- a/src/backends/neon/NeonTensorHandleFactory.hpp +++ b/src/backends/neon/NeonTensorHandleFactory.hpp @@ -17,9 +17,7 @@ class NeonTensorHandleFactory : public ITensorHandleFactory { public: NeonTensorHandleFactory(std::weak_ptr mgr) - : m_MemoryManager(mgr), - m_ImportFlags(static_cast(MemorySource::Malloc)), - m_ExportFlags(static_cast(MemorySource::Malloc)) + : m_MemoryManager(mgr) {} std::unique_ptr CreateSubTensorHandle(ITensorHandle& parent, @@ -50,8 +48,6 @@ public: private: mutable std::shared_ptr m_MemoryManager; - MemorySourceFlags m_ImportFlags; - MemorySourceFlags m_ExportFlags; }; } // namespace armnn -- cgit v1.2.1