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

5 files changed, 6 insertions, 121 deletions

diff --git a/src/armnnTestUtils/CMakeLists.txt b/src/armnnTestUtils/CMakeLists.txt
index 3738fad033..7f3726a478 100755
--- a/src/armnnTestUtils/CMakeLists.txt
+++ b/src/armnnTestUtils/CMakeLists.txt
@@ -10,6 +10,7 @@ list(APPEND armnnTestUtils_sources
         ../../include/armnnTestUtils/LayerTestResult.hpp
         ../../include/armnnTestUtils/PredicateResult.hpp
         ../../include/armnnTestUtils/TensorCopyUtils.hpp
+        ../../include/armnnTestUtils/WorkloadTestUtils.hpp
         TensorHelpers.hpp
         CreateWorkload.hpp
         CommonTestUtils.cpp
@@ -22,7 +23,6 @@ list(APPEND armnnTestUtils_sources
         TestUtils.hpp
         UnitTests.cpp
         UnitTests.hpp
-        WorkloadTestUtils.hpp
         )
 
 add_library_ex(armnnTestUtils SHARED ${armnnTestUtils_sources})
diff --git a/src/armnnTestUtils/CommonTestUtils.hpp b/src/armnnTestUtils/CommonTestUtils.hpp
index a4babc5568..3fadc888b9 100644
--- a/src/armnnTestUtils/CommonTestUtils.hpp
+++ b/src/armnnTestUtils/CommonTestUtils.hpp
@@ -13,9 +13,8 @@
 #include <ResolveType.hpp>
 
 #include <armnn/BackendRegistry.hpp>
-
 #include <armnn/Types.hpp>
-#include <backendsCommon/TensorHandle.hpp>
+#include <armnn/backends/TensorHandle.hpp>
 
 #include <algorithm>
 #include <random>
diff --git a/src/armnnTestUtils/CreateWorkload.hpp b/src/armnnTestUtils/CreateWorkload.hpp
index ea8a436177..15de5b5ddb 100644
--- a/src/armnnTestUtils/CreateWorkload.hpp
+++ b/src/armnnTestUtils/CreateWorkload.hpp
@@ -11,14 +11,13 @@
 #include <ResolveType.hpp>
 
 #include <armnnUtils/DataLayoutIndexed.hpp>
+#include <armnn/backends/TensorHandle.hpp>
+#include <armnn/backends/WorkloadData.hpp>
+#include <armnn/backends/WorkloadFactory.hpp>
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
 #include <armnn/utility/PolymorphicDowncast.hpp>
 
-#include <backendsCommon/TensorHandle.hpp>
-#include <backendsCommon/WorkloadData.hpp>
-#include <backendsCommon/WorkloadFactory.hpp>
-
 #include <doctest/doctest.h>
 
 #include <utility>
diff --git a/src/armnnTestUtils/UnitTests.hpp b/src/armnnTestUtils/UnitTests.hpp
index 788ad87718..82b87a1cee 100644
--- a/src/armnnTestUtils/UnitTests.hpp
+++ b/src/armnnTestUtils/UnitTests.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "TensorHelpers.hpp"
-#include "WorkloadTestUtils.hpp"
 
 #include <armnn/Logging.hpp>
 #include <armnn/Utils.hpp>
@@ -16,6 +15,7 @@
 
 #include <armnnTestUtils/LayerTestResult.hpp>
 #include <armnnTestUtils/TensorCopyUtils.hpp>
+#include <armnnTestUtils/WorkloadTestUtils.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/src/armnnTestUtils/WorkloadTestUtils.hpp b/src/armnnTestUtils/WorkloadTestUtils.hpp
deleted file mode 100644
index 856e54a72a..0000000000
--- a/src/armnnTestUtils/WorkloadTestUtils.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#pragma once
-
-#include <armnn/Tensor.hpp>
-
-#include <armnn/backends/IBackendInternal.hpp>
-#include <armnn/backends/IMemoryManager.hpp>
-#include <backendsCommon/Workload.hpp>
-#include <backendsCommon/WorkloadInfo.hpp>
-
-namespace armnn
-{
-class ITensorHandle;
-} // namespace armnn
-
-namespace
-{
-
-template <typename QueueDescriptor>
-void AddInputToWorkload(QueueDescriptor& descriptor,
-    armnn::WorkloadInfo& info,
-    const armnn::TensorInfo& tensorInfo,
-    armnn::ITensorHandle* tensorHandle)
-{
-    descriptor.m_Inputs.push_back(tensorHandle);
-    info.m_InputTensorInfos.push_back(tensorInfo);
-}
-
-template <typename QueueDescriptor>
-void AddOutputToWorkload(QueueDescriptor& descriptor,
-    armnn::WorkloadInfo& info,
-    const armnn::TensorInfo& tensorInfo,
-    armnn::ITensorHandle* tensorHandle)
-{
-    descriptor.m_Outputs.push_back(tensorHandle);
-    info.m_OutputTensorInfos.push_back(tensorInfo);
-}
-
-template <typename QueueDescriptor>
-void SetWorkloadInput(QueueDescriptor& descriptor,
-    armnn::WorkloadInfo& info,
-    unsigned int index,
-    const armnn::TensorInfo& tensorInfo,
-    armnn::ITensorHandle* tensorHandle)
-{
-    descriptor.m_Inputs[index] = tensorHandle;
-    info.m_InputTensorInfos[index] = tensorInfo;
-}
-
-template <typename QueueDescriptor>
-void SetWorkloadOutput(QueueDescriptor& descriptor,
-    armnn::WorkloadInfo& info,
-    unsigned int index,
-    const armnn::TensorInfo& tensorInfo,
-    armnn::ITensorHandle* tensorHandle)
-{
-    descriptor.m_Outputs[index] = tensorHandle;
-    info.m_OutputTensorInfos[index] = tensorInfo;
-}
-
-inline void ExecuteWorkload(armnn::IWorkload& workload,
-                            const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
-                            bool memoryManagementRequested = true)
-{
-    const bool manageMemory = memoryManager && memoryManagementRequested;
-
-    // Acquire working memory (if needed)
-    if (manageMemory)
-    {
-        memoryManager->Acquire();
-    }
-
-    // Perform PostAllocationConfiguration
-    workload.PostAllocationConfigure();
-
-    // Execute the workload
-    workload.Execute();
-
-    // Release working memory (if needed)
-    if (manageMemory)
-    {
-        memoryManager->Release();
-    }
-}
-
-inline armnn::Optional<armnn::DataType> GetBiasTypeFromWeightsType(armnn::Optional<armnn::DataType> weightsType)
-{
-    if (!weightsType)
-    {
-        return weightsType;
-    }
-
-    switch(weightsType.value())
-    {
-        case armnn::DataType::BFloat16:
-        case armnn::DataType::Float16:
-        case armnn::DataType::Float32:
-            return weightsType;
-        case armnn::DataType::QAsymmS8:
-        case armnn::DataType::QAsymmU8:
-        case armnn::DataType::QSymmS8:
-        case armnn::DataType::QSymmS16:
-            return armnn::DataType::Signed32;
-        default:
-            ARMNN_ASSERT_MSG(false, "GetBiasTypeFromWeightsType(): Unsupported data type.");
-    }
-    return armnn::EmptyOptional();
-}
-
-} // anonymous namespace