From 9efb57d62197aeb7d868c289bb34166c132f0287 Mon Sep 17 00:00:00 2001
From: David Beck <david.beck@arm.com>
Date: Mon, 5 Nov 2018 13:40:33 +0000
Subject: Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the
 ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc
---
 include/armnn/ArmNN.hpp    |  1 -
 include/armnn/IBackend.hpp | 22 ----------------------
 include/armnn/Types.hpp    | 16 ++++++++++++++--
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 include/armnn/IBackend.hpp

(limited to 'include/armnn')

diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index a9bb451931..f03b79d1ca 100644
--- a/include/armnn/ArmNN.hpp
+++ b/include/armnn/ArmNN.hpp
@@ -7,7 +7,6 @@
 #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
deleted file mode 100644
index 34df91c803..0000000000
--- a/include/armnn/IBackend.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// 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 2249a365d2..cd6e17be37 100644
--- a/include/armnn/Types.hpp
+++ b/include/armnn/Types.hpp
@@ -139,6 +139,20 @@ 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
 {
@@ -208,6 +222,4 @@ private:
 /// Define LayerGuid type.
 using LayerGuid = unsigned int;
 
-struct EmptyInitializer {};
-
 } // namespace armnn
-- 
cgit v1.2.1