diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2021-04-29 14:23:04 +0100 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2021-04-29 14:55:27 +0000 |
| commit | 73d3e2e1616ba5dcdb0a190afba2463742bd4fcc (patch) | |
| tree | 5e03f174a763c275d5874c804996048fb0b505ab /src/backends/backendsCommon/test/EndToEndTestImpl.hpp | |
| parent | 4df97eb257d3fc29b7431d9cb8a054b21d5a7448 (diff) | |
| download | armnn-73d3e2e1616ba5dcdb0a190afba2463742bd4fcc.tar.gz | |
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>
Diffstat (limited to 'src/backends/backendsCommon/test/EndToEndTestImpl.hpp')
| -rw-r--r-- | src/backends/backendsCommon/test/EndToEndTestImpl.hpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp index 3a757d0c59..a5fe8c6a62 100644 --- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp @@ -209,7 +209,7 @@ inline void ImportNonAlignedInputPointerTest(std::vector<BackendId> backends) NetworkId netId; std::string ignoredErrorMessage; // Enable Importing - INetworkProperties networkProperties(true, false); + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Undefined); runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties); // Creates structures for input & output @@ -274,7 +274,7 @@ inline void ExportNonAlignedOutputPointerTest(std::vector<BackendId> backends) NetworkId netId; std::string ignoredErrorMessage; // Enable Importing and Exporting - INetworkProperties networkProperties(true, true); + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc); runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties); // Creates structures for input & output @@ -345,7 +345,7 @@ inline void ImportAlignedPointerTest(std::vector<BackendId> backends) NetworkId netId; std::string ignoredErrorMessage; // Enable Importing - INetworkProperties networkProperties(true, true); + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc); runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties); // Creates structures for input & output @@ -428,7 +428,9 @@ inline void ImportOnlyWorkload(std::vector<BackendId> backends) // Load it into the runtime. It should pass. NetworkId netId; std::string ignoredErrorMessage; - INetworkProperties networkProperties(true, false); + + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Undefined); + BOOST_TEST(runtime->LoadNetwork(netId, std::move(optNet),ignoredErrorMessage, networkProperties) == Status::Success); @@ -516,7 +518,7 @@ inline void ExportOnlyWorkload(std::vector<BackendId> backends) // Load it into the runtime. It should pass. NetworkId netId; std::string ignoredErrorMessage; - INetworkProperties networkProperties(false, true); + INetworkProperties networkProperties(false, MemorySource::Undefined, MemorySource::Malloc); BOOST_TEST(runtime->LoadNetwork(netId, std::move(optNet),ignoredErrorMessage, networkProperties) == Status::Success); @@ -603,7 +605,9 @@ inline void ImportAndExportWorkload(std::vector<BackendId> backends) // Load it into the runtime. It should pass. NetworkId netId; std::string ignoredErrorMessage; - INetworkProperties networkProperties(true, true); + + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc); + BOOST_TEST(runtime->LoadNetwork(netId, std::move(optNet),ignoredErrorMessage, networkProperties) == Status::Success); @@ -694,7 +698,7 @@ inline void ExportOutputWithSeveralOutputSlotConnectionsTest(std::vector<Backend NetworkId netId; std::string ignoredErrorMessage; // Enable Importing - INetworkProperties networkProperties(true, true); + INetworkProperties networkProperties(false, MemorySource::Malloc, MemorySource::Malloc); runtime->LoadNetwork(netId, std::move(optNet), ignoredErrorMessage, networkProperties); // Creates structures for input & output |