commit 73d3e2e1616ba5dcdb0a190afba2463742bd4fcc
author Francis Murtagh <francis.murtagh@arm.com> Thu Apr 29 14:23:04 2021 +0100
committer Francis Murtagh <francis.murtagh@arm.com> Thu Apr 29 14:55:27 2021 +0000
tree 5e03f174a763c275d5874c804996048fb0b505ab
parent 4df97eb257d3fc29b7431d9cb8a054b21d5a7448

IVGCVSW-5819 5820 5821 Add MemorySourceFlags to TensorHandleFactoryRegistry::GetFactory

 * Modify Layer::CreateTensorHandles to include MemorySource
 * Modify INetworkProperties to add MemorySource
 * Disable Neon/Cl fallback tests until full import implementation complete

Change-Id: Ia4fff6ea3d4bf6afca33aae358125ccaec7f9a38
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>

src/backends/cl/test/ClFallbackTests.cpp

diff --git a/src/backends/cl/test/ClFallbackTests.cpp b/src/backends/cl/test/ClFallbackTests.cpp
index 4384ae5..eec3afe 100644
--- a/src/backends/cl/test/ClFallbackTests.cpp
+++ b/src/backends/cl/test/ClFallbackTests.cpp
@@ -11,7 +11,7 @@
 
 BOOST_AUTO_TEST_SUITE(ClFallback)
 
-BOOST_AUTO_TEST_CASE(ClImportEnabledFallbackToNeon)
+BOOST_AUTO_TEST_CASE(ClImportEnabledFallbackToNeon, * boost::unit_test::disabled())
 {
     using namespace armnn;
 
@@ -78,8 +78,7 @@
     // Load it into the runtime. It should pass.
     NetworkId netId;
     std::string ignoredErrorMessage;
-    INetworkProperties networkProperties(true, true);
-
+    INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc);
     runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties);
 
     // Creates structures for input & output
@@ -259,7 +258,7 @@
     BOOST_TEST(outputData == expectedOutput);
 }
 
-BOOST_AUTO_TEST_CASE(ClImportEnabledFallbackSubgraphToNeon)
+BOOST_AUTO_TEST_CASE(ClImportEnabledFallbackSubgraphToNeon, * boost::unit_test::disabled())
 {
     using namespace armnn;
 
@@ -337,8 +336,7 @@
     // Load it into the runtime. It should pass.
     NetworkId netId;
     std::string ignoredErrorMessage;
-    INetworkProperties networkProperties(true, true);
-
+    INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc);
     runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties);
 
     // Creates structures for input & output