11 files changed, 14 insertions, 108 deletions
diff --git a/src/backends/backendsCommon/BackendContextRegistry.cpp b/src/backends/backendsCommon/BackendContextRegistry.cpp
deleted file mode 100644
index 0168a127af..0000000000
--- a/src/backends/backendsCommon/BackendContextRegistry.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#include "BackendContextRegistry.hpp"
-
-namespace armnn
-{
-
-BackendContextRegistry& BackendContextRegistryInstance()
-{
-    static BackendContextRegistry instance;
-    return instance;
-}
-
-} // namespace armnn
diff --git a/src/backends/backendsCommon/BackendContextRegistry.hpp b/src/backends/backendsCommon/BackendContextRegistry.hpp
deleted file mode 100644
index 23830a0105..0000000000
--- a/src/backends/backendsCommon/BackendContextRegistry.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#pragma once
-
-#include "IBackendContext.hpp"
-#include "RegistryCommon.hpp"
-
-#include <armnn/IRuntime.hpp>
-#include <armnn/Types.hpp>
-
-namespace armnn
-{
-
-using BackendContextRegistry = RegistryCommon<IBackendContext,
-                                              IBackendContextUniquePtr,
-                                              IRuntime::CreationOptions>;
-
-BackendContextRegistry& BackendContextRegistryInstance();
-
-template <>
-struct RegisteredTypeName<IBackendContext>
-{
-    static const char * Name() { return "IBackendContext"; }
-};
-
-} // namespace armnn
diff --git a/src/backends/backendsCommon/BackendRegistry.hpp b/src/backends/backendsCommon/BackendRegistry.hpp
index ba2d26aaea..145da8819c 100644
--- a/src/backends/backendsCommon/BackendRegistry.hpp
+++ b/src/backends/backendsCommon/BackendRegistry.hpp
@@ -12,9 +12,7 @@
 namespace armnn
 {
 
-using BackendRegistry = RegistryCommon<IBackendInternal,
-                                       IBackendInternalUniquePtr,
-                                       EmptyInitializer>;
+using BackendRegistry = RegistryCommon<IBackendInternal, IBackendInternalUniquePtr>;
 
 BackendRegistry& BackendRegistryInstance();
 
diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt
index cb89aebc4e..9dd9b92fe3 100644
--- a/src/backends/backendsCommon/CMakeLists.txt
+++ b/src/backends/backendsCommon/CMakeLists.txt
@@ -4,14 +4,11 @@
 #
 
 list(APPEND armnnBackendsCommon_sources
-    BackendContextRegistry.cpp
-    BackendContextRegistry.hpp
     BackendRegistry.cpp
     BackendRegistry.hpp
     CpuTensorHandle.cpp
     CpuTensorHandleFwd.hpp
     CpuTensorHandle.hpp
-    IBackendContext.hpp
     IBackendInternal.hpp
     ILayerSupport.cpp
     ITensorHandle.hpp
diff --git a/src/backends/backendsCommon/IBackendContext.hpp b/src/backends/backendsCommon/IBackendContext.hpp
deleted file mode 100644
index d073d12868..0000000000
--- a/src/backends/backendsCommon/IBackendContext.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#pragma once
-
-#include <armnn/IRuntime.hpp>
-#include <memory>
-
-namespace armnn
-{
-
-class IBackendContext
-{
-public:
-    virtual ~IBackendContext() {}
-
-protected:
-    IBackendContext(const IRuntime::CreationOptions& options) {}
-
-private:
-    IBackendContext() = delete;
-};
-
-using IBackendContextUniquePtr = std::unique_ptr<IBackendContext>;
-
-} // namespace armnn
diff --git a/src/backends/backendsCommon/IBackendInternal.hpp b/src/backends/backendsCommon/IBackendInternal.hpp
index a24b60064a..7e44dbd676 100644
--- a/src/backends/backendsCommon/IBackendInternal.hpp
+++ b/src/backends/backendsCommon/IBackendInternal.hpp
@@ -4,8 +4,7 @@
 //
 #pragma once
 
-#include <armnn/IBackend.hpp>
-#include <memory>
+#include <armnn/Types.hpp>
 
 namespace armnn
 {
@@ -14,6 +13,8 @@ class IWorkloadFactory;
 class IBackendInternal : public IBackend
 {
 protected:
+    // Creation must be done through a specific
+    // backend interface.
     IBackendInternal() = default;
 
 public:
diff --git a/src/backends/backendsCommon/LayerSupportRegistry.hpp b/src/backends/backendsCommon/LayerSupportRegistry.hpp
index 6124685032..a5efad05ef 100644
--- a/src/backends/backendsCommon/LayerSupportRegistry.hpp
+++ b/src/backends/backendsCommon/LayerSupportRegistry.hpp
@@ -6,13 +6,11 @@
 
 #include "RegistryCommon.hpp"
 #include <armnn/ILayerSupport.hpp>
-#include <armnn/Types.hpp>
 
 namespace armnn
 {
-using LayerSupportRegistry = RegistryCommon<ILayerSupport,
-                                            ILayerSupportSharedPtr,
-                                            EmptyInitializer>;
+
+using LayerSupportRegistry = RegistryCommon<ILayerSupport, ILayerSupportSharedPtr>;
 
 LayerSupportRegistry& LayerSupportRegistryInstance();
 
diff --git a/src/backends/backendsCommon/RegistryCommon.hpp b/src/backends/backendsCommon/RegistryCommon.hpp
index 3dbfad2a66..03bd338090 100644
--- a/src/backends/backendsCommon/RegistryCommon.hpp
+++ b/src/backends/backendsCommon/RegistryCommon.hpp
@@ -22,11 +22,11 @@ struct RegisteredTypeName
     static const char * Name() { return "UNKNOWN"; }
 };
 
-template <typename RegisteredType, typename PointerType, typename ParamType>
+template <typename RegisteredType, typename PointerType>
 class RegistryCommon
 {
 public:
-    using FactoryFunction = std::function<PointerType(const ParamType&)>;
+    using FactoryFunction = std::function<PointerType()>;
 
     void Register(const BackendId& id, FactoryFunction factory)
     {
@@ -53,20 +53,6 @@ public:
         return it->second;
     }
 
-    FactoryFunction GetFactory(const BackendId& id,
-                               FactoryFunction defaultFactory) const
-    {
-        auto it = m_Factories.find(id);
-        if (it == m_Factories.end())
-        {
-            return defaultFactory;
-        }
-        else
-        {
-            return it->second;
-        }
-    }
-
     size_t Size() const
     {
         return m_Factories.size();
@@ -131,4 +117,4 @@ struct StaticRegistryInitializer
     }
 };
 
-} // namespace armnn
-\ No newline at end of file
+} // namespace armnn
diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp
index 83a20e8675..9f974522aa 100644
--- a/src/backends/backendsCommon/WorkloadFactory.cpp
+++ b/src/backends/backendsCommon/WorkloadFactory.cpp
@@ -68,7 +68,7 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId,
 
     auto const& layerSupportRegistry = LayerSupportRegistryInstance();
     auto layerSupportFactory = layerSupportRegistry.GetFactory(backendId);
-    auto layerSupportObject = layerSupportFactory(EmptyInitializer());
+    auto layerSupportObject = layerSupportFactory();
 
     switch(layer.GetType())
     {
diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk
index 152ada3532..b1583b987e 100644
--- a/src/backends/backendsCommon/common.mk
+++ b/src/backends/backendsCommon/common.mk
@@ -8,7 +8,6 @@
 # file in the root of ArmNN
 
 COMMON_SOURCES := \
-    BackendContextRegistry.cpp \
     BackendRegistry.cpp \
     CpuTensorHandle.cpp \
     ILayerSupport.cpp \
@@ -27,4 +26,3 @@ COMMON_TEST_SOURCES := \
     test/WorkloadDataValidation.cpp \
     test/TensorCopyUtils.cpp \
     test/LayerTests.cpp
-
diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
index 4afe273de4..0bc655be09 100644
--- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp
+++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(TestRegistryHelper)
     StaticRegistryInitializer<BackendRegistry> factoryHelper(
         BackendRegistryInstance(),
         "HelloWorld",
-        [&called](const EmptyInitializer&)
+        [&called]()
         {
             called = true;
             return armnn::IBackendInternalUniquePtr(nullptr);
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(TestRegistryHelper)
     // sanity check: the factory still not called
     BOOST_TEST(called == false);
 
-    factoryFunction(EmptyInitializer());
+    factoryFunction();
     BOOST_TEST(called == true);
 }
 
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(TestDirectCallToRegistry)
     bool called = false;
     BackendRegistryInstance().Register(
         "HelloWorld",
-        [&called](const EmptyInitializer&)
+        [&called]()
         {
             called = true;
             return armnn::IBackendInternalUniquePtr(nullptr);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(TestDirectCallToRegistry)
     // sanity check: the factory still not called
     BOOST_TEST(called == false);
 
-    factoryFunction(EmptyInitializer());
+    factoryFunction();
     BOOST_TEST(called == true);
 }