commit b275da5afe480e994fe6cd897b3090c52f1bcdea
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Fri Dec 17 17:27:37 2021 +0000
committer Francis Murtagh <francis.murtagh@arm.com> Tue Jan 11 11:59:22 2022 +0000
tree 390246b981d5d39f79099b57a56c0f21c2932c05
parent 2048bcf8ed671b593ac9af2974e10319b9058b20

IVGCVSW-6675 Add functionality for CopyAndImportFactoryPair
 to TensorHandleFactoryRegistry

 * Add RegisterCopyAndImportFactoryPair
 * Add GetMatchingImportFactoryId
 * Unit tests

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I91e71bdeadec8fedbce7088016c06a47a03bdbaa

src/armnn/test/TensorHandleStrategyTest.cpp

diff --git a/src/armnn/test/TensorHandleStrategyTest.cpp b/src/armnn/test/TensorHandleStrategyTest.cpp
index fb26880..374479b 100644
--- a/src/armnn/test/TensorHandleStrategyTest.cpp
+++ b/src/armnn/test/TensorHandleStrategyTest.cpp
@@ -392,4 +392,18 @@
     CHECK(importCount == 1);
 }
 
+TEST_CASE("RegisterCopyAndImportFactoryPairTest")
+{
+    TensorHandleFactoryRegistry registry;
+    ITensorHandleFactory::FactoryId copyId = "CopyFactoryId";
+    ITensorHandleFactory::FactoryId importId = "ImportFactoryId";
+    registry.RegisterCopyAndImportFactoryPair(copyId, importId);
+
+    // Get mathing import factory id correctly
+    CHECK((registry.GetMatchingImportFactoryId(copyId) == importId));
+
+    // Return empty id when Invailid Id is given
+    CHECK((registry.GetMatchingImportFactoryId("InvalidFactoryId") == ""));
+}
+
 }

src/backends/backendsCommon/TensorHandleFactoryRegistry.cpp

diff --git a/src/backends/backendsCommon/TensorHandleFactoryRegistry.cpp b/src/backends/backendsCommon/TensorHandleFactoryRegistry.cpp
index cc8a136..8094f04 100644
--- a/src/backends/backendsCommon/TensorHandleFactoryRegistry.cpp
+++ b/src/backends/backendsCommon/TensorHandleFactoryRegistry.cpp
@@ -63,6 +63,18 @@
     return nullptr;
 }
 
+void TensorHandleFactoryRegistry::RegisterCopyAndImportFactoryPair(ITensorHandleFactory::FactoryId copyFactoryId,
+                                                                   ITensorHandleFactory::FactoryId importFactoryId)
+{
+    m_FactoryMappings[copyFactoryId] = importFactoryId;
+}
+
+ITensorHandleFactory::FactoryId TensorHandleFactoryRegistry::GetMatchingImportFactoryId(
+    ITensorHandleFactory::FactoryId copyFactoryId)
+{
+    return m_FactoryMappings[copyFactoryId];
+}
+
 void TensorHandleFactoryRegistry::AquireMemory()
 {
     for (auto& mgr : m_MemoryManagers)

src/backends/backendsCommon/TensorHandleFactoryRegistry.hpp

diff --git a/src/backends/backendsCommon/TensorHandleFactoryRegistry.hpp b/src/backends/backendsCommon/TensorHandleFactoryRegistry.hpp
index 525db56..2a7c6f3 100644
--- a/src/backends/backendsCommon/TensorHandleFactoryRegistry.hpp
+++ b/src/backends/backendsCommon/TensorHandleFactoryRegistry.hpp
@@ -16,6 +16,8 @@
 //Forward
 class IMemoryManager;
 
+using CopyAndImportFactoryPairs = std::map<ITensorHandleFactory::FactoryId, ITensorHandleFactory::FactoryId>;
+
 ///
 class TensorHandleFactoryRegistry
 {
@@ -39,6 +41,13 @@
     ITensorHandleFactory* GetFactory(ITensorHandleFactory::FactoryId id,
                                      MemorySource memSource) const;
 
+    /// Register a pair of TensorHandleFactory Id for Memory Copy and TensorHandleFactory Id for Memory Import
+    void RegisterCopyAndImportFactoryPair(ITensorHandleFactory::FactoryId copyFactoryId,
+                                          ITensorHandleFactory::FactoryId importFactoryId);
+
+    /// Get a matching TensorHandleFatory Id for Memory Import given TensorHandleFactory Id for Memory Copy
+    ITensorHandleFactory::FactoryId GetMatchingImportFactoryId(ITensorHandleFactory::FactoryId copyFactoryId);
+
     /// Aquire memory required for inference
     void AquireMemory();
 
@@ -53,6 +62,7 @@
 private:
     std::vector<std::unique_ptr<ITensorHandleFactory>> m_Factories;
     std::vector<std::shared_ptr<IMemoryManager>> m_MemoryManagers;
+    CopyAndImportFactoryPairs m_FactoryMappings;
 };
 
 } // namespace armnn