diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2022-01-17 18:03:14 +0000 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2022-01-24 20:24:12 +0000 |
| commit | d12b40792591309c627f215574aa082a5efd03ca (patch) | |
| tree | 98f5f903db2dd6e782c5c46a7a7797bd4302bb4a /src/backends/cl/ClBackend.cpp | |
| parent | faf2966888ecd0b93726602bf4b0b1bd36301d8c (diff) | |
| download | armnn-d12b40792591309c627f215574aa082a5efd03ca.tar.gz | |
IVGCVSW-6677 Register CopyAndImportFactoryPairs to ClBackend and unit tests
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: Ib0bf99c81ae1b30079be194a82b207761cb56028
Diffstat (limited to 'src/backends/cl/ClBackend.cpp')
| -rw-r--r-- | src/backends/cl/ClBackend.cpp | 59 |
1 files changed, 46 insertions, 13 deletions
diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index cf5f50025a..8abb16ccca 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -84,10 +84,16 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( memoryManager = std::make_shared<ClMemoryManager>(std::make_unique<arm_compute::CLBufferAllocator>()); } + std::unique_ptr<ITensorHandleFactory> factory = std::make_unique<ClTensorHandleFactory>(memoryManager); + std::unique_ptr<ITensorHandleFactory> importFactory = std::make_unique<ClImportTensorHandleFactory>( + static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc)); + + registry.RegisterCopyAndImportFactoryPair(factory->GetId(), importFactory->GetId()); + registry.RegisterCopyAndImportFactoryPair(importFactory->GetId(), factory->GetId()); + registry.RegisterMemoryManager(memoryManager); - registry.RegisterFactory(std::make_unique<ClTensorHandleFactory>(memoryManager)); - registry.RegisterFactory(std::make_unique<ClImportTensorHandleFactory>( - static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc))); + registry.RegisterFactory(std::move(factory)); + registry.RegisterFactory(std::move(importFactory)); return std::make_unique<ClWorkloadFactory>( PolymorphicPointerDowncast<ClMemoryManager>(memoryManager)); @@ -106,10 +112,16 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( memoryManager = std::make_shared<ClMemoryManager>(std::make_unique<arm_compute::CLBufferAllocator>()); } + std::unique_ptr<ITensorHandleFactory> factory = std::make_unique<ClTensorHandleFactory>(memoryManager); + std::unique_ptr<ITensorHandleFactory> importFactory = std::make_unique<ClImportTensorHandleFactory>( + static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc)); + + registry.RegisterCopyAndImportFactoryPair(factory->GetId(), importFactory->GetId()); + registry.RegisterCopyAndImportFactoryPair(importFactory->GetId(), factory->GetId()); + registry.RegisterMemoryManager(memoryManager); - registry.RegisterFactory(std::make_unique<ClTensorHandleFactory>(memoryManager)); - registry.RegisterFactory(std::make_unique<ClImportTensorHandleFactory>( - static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc))); + registry.RegisterFactory(std::move(factory)); + registry.RegisterFactory(std::move(importFactory)); return std::make_unique<ClWorkloadFactory>( PolymorphicPointerDowncast<ClMemoryManager>(memoryManager), CreateBackendSpecificModelContext(modelOptions)); @@ -131,9 +143,16 @@ IBackendInternal::IWorkloadFactoryPtr ClBackend::CreateWorkloadFactory( memoryManager = std::make_shared<ClMemoryManager>(std::make_unique<arm_compute::CLBufferAllocator>()); } + std::unique_ptr<ITensorHandleFactory> factory = std::make_unique<ClTensorHandleFactory>(memoryManager); + std::unique_ptr<ITensorHandleFactory> importFactory = std::make_unique<ClImportTensorHandleFactory>( + inputFlags, outputFlags); + + registry.RegisterCopyAndImportFactoryPair(factory->GetId(), importFactory->GetId()); + registry.RegisterCopyAndImportFactoryPair(importFactory->GetId(), factory->GetId()); + registry.RegisterMemoryManager(memoryManager); - registry.RegisterFactory(std::make_unique<ClTensorHandleFactory>(memoryManager)); - registry.RegisterFactory(std::make_unique<ClImportTensorHandleFactory>(inputFlags, outputFlags)); + registry.RegisterFactory(std::move(factory)); + registry.RegisterFactory(std::move(importFactory)); return std::make_unique<ClWorkloadFactory>( PolymorphicPointerDowncast<ClMemoryManager>(memoryManager), CreateBackendSpecificModelContext(modelOptions)); @@ -157,10 +176,17 @@ void ClBackend::RegisterTensorHandleFactories(TensorHandleFactoryRegistry& regis memoryManager = std::make_shared<ClMemoryManager>(std::make_unique<arm_compute::CLBufferAllocator>()); } + std::unique_ptr<ITensorHandleFactory> factory = std::make_unique<ClTensorHandleFactory>(memoryManager); + std::unique_ptr<ITensorHandleFactory> importFactory = std::make_unique<ClImportTensorHandleFactory>( + static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc)); + + registry.RegisterCopyAndImportFactoryPair(factory->GetId(), importFactory->GetId()); + registry.RegisterCopyAndImportFactoryPair(importFactory->GetId(), factory->GetId()); + registry.RegisterMemoryManager(memoryManager); - registry.RegisterFactory(std::make_unique<ClTensorHandleFactory>(memoryManager)); - registry.RegisterFactory(std::make_unique<ClImportTensorHandleFactory>( - static_cast<MemorySourceFlags>(MemorySource::Malloc), static_cast<MemorySourceFlags>(MemorySource::Malloc))); + registry.RegisterFactory(std::move(factory)); + registry.RegisterFactory(std::move(importFactory)); + } void ClBackend::RegisterTensorHandleFactories(TensorHandleFactoryRegistry& registry, @@ -177,9 +203,16 @@ void ClBackend::RegisterTensorHandleFactories(TensorHandleFactoryRegistry& regis memoryManager = std::make_shared<ClMemoryManager>(std::make_unique<arm_compute::CLBufferAllocator>()); } + std::unique_ptr<ITensorHandleFactory> factory = std::make_unique<ClTensorHandleFactory>(memoryManager); + std::unique_ptr<ITensorHandleFactory> importFactory = std::make_unique<ClImportTensorHandleFactory>( + inputFlags, outputFlags); + + registry.RegisterCopyAndImportFactoryPair(factory->GetId(), importFactory->GetId()); + registry.RegisterCopyAndImportFactoryPair(importFactory->GetId(), factory->GetId()); + registry.RegisterMemoryManager(memoryManager); - registry.RegisterFactory(std::make_unique<ClTensorHandleFactory>(memoryManager)); - registry.RegisterFactory(std::make_unique<ClImportTensorHandleFactory>(inputFlags, outputFlags)); + registry.RegisterFactory(std::move(factory)); + registry.RegisterFactory(std::move(importFactory)); } IBackendInternal::IBackendContextPtr ClBackend::CreateBackendContext(const IRuntime::CreationOptions& options) const |