From 0c2b2897cb65b562b97014ae748e91d8b9a3d3b4 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Mon, 5 Aug 2019 14:12:11 +0100 Subject: IVGCVSW-3596 Register the dynamic backends in the BackendRegistry * Added getter for the factory function in the DynamicBackend class * Added new RegisterDynamicBackends method in utils class * Added dynamic backend registration process in the Runtime class * Added new dummy dynamic backend objects for testing * Added unit tests for dynamic backend registration * Added convenience methods to BackendId Change-Id: I01e147d1d6f01bf56747ad946f73f867af5770c4 Signed-off-by: Matteo Martincigh --- .../backendsCommon/DynamicBackendUtils.cpp | 68 +++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) (limited to 'src/backends/backendsCommon/DynamicBackendUtils.cpp') diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index 57a605608c..38ac5ad6af 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -281,7 +281,6 @@ std::vector DynamicBackendUtils::CreateDynamicBackends(const { BOOST_LOG_TRIVIAL(warning) << "Invalid dynamic backend object for the shared object file \"" << sharedObject << "\""; - continue; } @@ -292,4 +291,71 @@ std::vector DynamicBackendUtils::CreateDynamicBackends(const return dynamicBackends; } +void DynamicBackendUtils::RegisterDynamicBackends(const std::vector& dynamicBackends) +{ + // Get a reference of the backend registry + BackendRegistry& backendRegistry = BackendRegistryInstance(); + + // Register the dynamic backends in the backend registry + RegisterDynamicBackendsImpl(backendRegistry, dynamicBackends); +} + +void DynamicBackendUtils::RegisterDynamicBackendsImpl(BackendRegistry& backendRegistry, + const std::vector& dynamicBackends) +{ + // Register the dynamic backends in the backend registry + for (const DynamicBackendPtr& dynamicBackend : dynamicBackends) + { + BackendId dynamicBackendId; + try + { + dynamicBackendId = dynamicBackend->GetBackendId(); + } + catch (const RuntimeException& e) + { + BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend, " + << "an error has occurred when getting the backend id: " << e.what(); + continue; + } + if (dynamicBackendId.IsEmpty() || + dynamicBackendId.IsUndefined()) + { + BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend, invalid backend id: " << dynamicBackendId; + continue; + } + + // Check whether the dynamic backend is already registered + bool backendAlreadyRegistered = backendRegistry.IsBackendRegistered(dynamicBackendId); + if (backendAlreadyRegistered) + { + BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": backend already registered"; + continue; + } + + // Get the dynamic backend factory function + BackendRegistry::FactoryFunction dynamicBackendFactoryFunction = nullptr; + try + { + dynamicBackendFactoryFunction = dynamicBackend->GetFactoryFunction(); + } + catch (const RuntimeException& e) + { + BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": an error has occurred when getting the backend factory function: " + << e.what(); + continue; + } + if (dynamicBackendFactoryFunction == nullptr) + { + BOOST_LOG_TRIVIAL(warning) << "Cannot register dynamic backend \"" << dynamicBackendId + << "\": invalid backend factory function"; + continue; + } + + // Register the dynamic backend + backendRegistry.Register(dynamicBackendId, dynamicBackendFactoryFunction); + } +} + } // namespace armnn -- cgit v1.2.1