IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend

Change-Id: Ice19d3f763298bc14585267df389e99df846320d

3 files changed, 25 insertions, 14 deletions

diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index f03b79d1ca..a9bb451931 100644
--- a/include/armnn/ArmNN.hpp
+++ b/include/armnn/ArmNN.hpp
@@ -7,6 +7,7 @@
 #include "BackendId.hpp"
 #include "Descriptors.hpp"
 #include "Exceptions.hpp"
+#include "IBackend.hpp"
 #include "IRuntime.hpp"
 #include "INetwork.hpp"
 #include "LayerSupport.hpp"
diff --git a/include/armnn/IBackend.hpp b/include/armnn/IBackend.hpp
new file mode 100644
index 0000000000..34df91c803
--- /dev/null
+++ b/include/armnn/IBackend.hpp
@@ -0,0 +1,22 @@
+//
+// Copyright © 2017 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+#pragma once
+
+#include "BackendId.hpp"
+
+namespace armnn
+{
+
+class IBackend
+{
+protected:
+    IBackend() {}
+    virtual ~IBackend() {}
+
+public:
+    virtual const BackendId& GetId() const = 0;
+};
+
+} // namespace armnn
\ No newline at end of file
diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp
index cd6e17be37..2249a365d2 100644
--- a/include/armnn/Types.hpp
+++ b/include/armnn/Types.hpp
@@ -139,20 +139,6 @@ enum class OutputShapeRounding
     Ceiling     = 1
 };
 
-/// Each backend should implement an IBackend.
-class IBackend
-{
-protected:
-    IBackend() {}
-    virtual ~IBackend() {}
-
-public:
-    virtual const BackendId& GetId() const = 0;
-};
-
-using IBackendSharedPtr = std::shared_ptr<IBackend>;
-using IBackendUniquePtr = std::unique_ptr<IBackend, void(*)(IBackend* backend)>;
-
 /// Device specific knowledge to be passed to the optimizer.
 class IDeviceSpec
 {
@@ -222,4 +208,6 @@ private:
 /// Define LayerGuid type.
 using LayerGuid = unsigned int;
 
+struct EmptyInitializer {};
+
 } // namespace armnn