From ec67a0f08e0f96a5aebf3cac65331c67f6649f5e Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Fri, 25 Nov 2022 13:55:24 +0000
Subject: IVGCVSW-7209 Remove deprecated code due to be removed in 23.02

* Removed weights and bias from Convolution, DepthwiseConv & FullyConnected
  layers
* Removed the weight and bias ConstTensorHandles from the QueueDescriptors
* Updated Workloads to take tensors from WorkloadInfo rather than the
  QueueDescriptors
* Removed unused RedirectMembersToConstantInputs optimization and tests.

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I9ffcdc4a1c0dff725539dd69fc435b700bd98a56
---
 src/backends/neon/workloads/NeonWorkloadUtils.hpp | 38 ++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'src/backends/neon/workloads/NeonWorkloadUtils.hpp')

diff --git a/src/backends/neon/workloads/NeonWorkloadUtils.hpp b/src/backends/neon/workloads/NeonWorkloadUtils.hpp
index f9c3718e14..9f8bb9540e 100644
--- a/src/backends/neon/workloads/NeonWorkloadUtils.hpp
+++ b/src/backends/neon/workloads/NeonWorkloadUtils.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
@@ -57,6 +57,42 @@ void CopyArmComputeTensorData(arm_compute::Tensor& dstTensor, const T* srcData)
     CopyArmComputeITensorData(srcData, dstTensor);
 }
 
+inline void InitializeArmComputeTensorData(arm_compute::Tensor& tensor,
+                                           TensorInfo tensorInfo,
+                                           const ITensorHandle* handle)
+{
+    ARMNN_ASSERT(handle);
+
+    switch(tensorInfo.GetDataType())
+    {
+        case DataType::Float16:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const armnn::Half*>(handle->Map()));
+            break;
+        case DataType::Float32:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const float*>(handle->Map()));
+            break;
+        case DataType::QAsymmU8:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const uint8_t*>(handle->Map()));
+            break;
+        case DataType::QSymmS8:
+        case DataType::QAsymmS8:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const int8_t*>(handle->Map()));
+            break;
+        case DataType::Signed32:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const int32_t*>(handle->Map()));
+            break;
+        case DataType::QSymmS16:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const int16_t*>(handle->Map()));
+            break;
+        case DataType::BFloat16:
+            CopyArmComputeTensorData(tensor, reinterpret_cast<const armnn::BFloat16*>(handle->Map()));
+            break;
+        default:
+            // Throw exception; assertion not called in release build.
+            throw Exception("Unexpected tensor type during InitializeArmComputeTensorData().");
+    }
+};
+
 inline void InitializeArmComputeTensorData(arm_compute::Tensor& tensor,
                                            const ConstTensorHandle* handle)
 {
-- 
cgit v1.2.1