From 0c47974f1800e8770904aecaef15d6f105758c4e Mon Sep 17 00:00:00 2001
From: Colm Donelan <colm.donelan@arm.com>
Date: Fri, 10 Dec 2021 12:43:54 +0000
Subject: IVGCVSW-6626 Promote backend headers in backendCommon to 
 armnn/backends

Move the following header files from backendsCommon to armnn/backends.

* MemCopyWorkload.hpp
* TensorHandle.hpp
* Workload.hpp
* WorkloadData.hpp
* WorkloadFactory.hpp

Replace them with forwarding headers and a pragma deprecation message.
Resolve the deprecation messages in Arm NN code.

Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I47f116b30f86e478c9057795bc518c391a8ae514
---
 src/armnn/test/CloneTests.cpp                 | 3 +--
 src/armnn/test/ConstTensorLayerVisitor.hpp    | 2 +-
 src/armnn/test/CreateWorkload.hpp             | 7 +++----
 src/armnn/test/GraphTests.cpp                 | 2 +-
 src/armnn/test/OptimizerTests.cpp             | 2 +-
 src/armnn/test/ShapeInferenceTests.cpp        | 4 ++--
 src/armnn/test/SubgraphViewTests.cpp          | 2 +-
 src/armnn/test/TestLayerVisitor.hpp           | 2 +-
 src/armnn/test/optimizations/FoldPadTests.cpp | 2 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/armnn/test')

diff --git a/src/armnn/test/CloneTests.cpp b/src/armnn/test/CloneTests.cpp
index b59e8a4806..e93b989aa1 100644
--- a/src/armnn/test/CloneTests.cpp
+++ b/src/armnn/test/CloneTests.cpp
@@ -10,9 +10,8 @@
 #include <armnn/Exceptions.hpp>
 #include <armnn/Optional.hpp>
 #include <armnn/backends/IBackendInternal.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
-
-#include <backendsCommon/TensorHandle.hpp>
 #include <backendsCommon/WorkloadFactoryBase.hpp>
 
 #include <doctest/doctest.h>
diff --git a/src/armnn/test/ConstTensorLayerVisitor.hpp b/src/armnn/test/ConstTensorLayerVisitor.hpp
index 5538852b60..4d887c8e37 100644
--- a/src/armnn/test/ConstTensorLayerVisitor.hpp
+++ b/src/armnn/test/ConstTensorLayerVisitor.hpp
@@ -10,7 +10,7 @@
 #include <armnn/LstmParams.hpp>
 #include <armnn/QuantizedLstmParams.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index ae07253841..09b281be94 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 //
 
-// This file is deprecated and will be removed soon.
-// Please use the new header in armnnTestUtils instead.
-// This will use the new armnnTestUtils header.
-#include "../../armnnTestUtils/CreateWorkload.hpp"
\ No newline at end of file
+#include "../../armnnTestUtils/CreateWorkload.hpp"
+#pragma message("src/armnn/test/CreateWorkload.hpp has been deprecated, it is due for removal in"\
+                " 22.08 release. Please use src/armnnTestUtils/CreateWorkload.hpp instead.")
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index d246a082ec..6b3e611017 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -14,7 +14,7 @@
 
 #include <armnn/backends/IBackendInternal.hpp>
 
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 #include <backendsCommon/TensorHandleFactoryRegistry.hpp>
 
 #include <doctest/doctest.h>
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index a5db0ac0b0..900d4d6335 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -20,7 +20,7 @@
 #include <armnn/backends/IBackendInternal.hpp>
 
 #include <backendsCommon/LayerSupportBase.hpp>
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/src/armnn/test/ShapeInferenceTests.cpp b/src/armnn/test/ShapeInferenceTests.cpp
index f808a0e349..687462dfb5 100644
--- a/src/armnn/test/ShapeInferenceTests.cpp
+++ b/src/armnn/test/ShapeInferenceTests.cpp
@@ -9,8 +9,8 @@
 #include <Graph.hpp>
 #include <InternalTypes.hpp>
 #include <layers/FullyConnectedLayer.hpp>
-#include <backendsCommon/TensorHandle.hpp>
-#include <backendsCommon/WorkloadData.hpp>
+#include <armnn/backends/TensorHandle.hpp>
+#include <armnn/backends/WorkloadData.hpp>
 
 #include <string>
 
diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp
index 4e509be78b..a1a57c1b56 100644
--- a/src/armnn/test/SubgraphViewTests.cpp
+++ b/src/armnn/test/SubgraphViewTests.cpp
@@ -11,7 +11,7 @@
 
 #include <armnn/utility/NumericCast.hpp>
 
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 #include <fstream>
 #include <map>
 #include <queue>
diff --git a/src/armnn/test/TestLayerVisitor.hpp b/src/armnn/test/TestLayerVisitor.hpp
index eaf1667800..c39ea2670f 100644
--- a/src/armnn/test/TestLayerVisitor.hpp
+++ b/src/armnn/test/TestLayerVisitor.hpp
@@ -6,7 +6,7 @@
 
 #include <armnn/StrategyBase.hpp>
 #include <armnn/Descriptors.hpp>
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 
 namespace armnn
 {
diff --git a/src/armnn/test/optimizations/FoldPadTests.cpp b/src/armnn/test/optimizations/FoldPadTests.cpp
index a64660f987..2f9e1c6d31 100644
--- a/src/armnn/test/optimizations/FoldPadTests.cpp
+++ b/src/armnn/test/optimizations/FoldPadTests.cpp
@@ -7,7 +7,7 @@
 #include <Network.hpp>
 #include <TestUtils.hpp>
 #include <doctest/doctest.h>
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 #include <Optimizer.hpp>
 
 TEST_SUITE("Optimizer")
-- 
cgit v1.2.1