From 1f58f03d82c482626b1b4673b6c0e25da4338fb5 Mon Sep 17 00:00:00 2001
From: James Conroy <james.conroy@arm.com>
Date: Tue, 27 Apr 2021 17:13:27 +0100
Subject: IVGCVSW-5815 Generalise ConstCpuTensorHandle

* Generalises ConstCpuTensorHandle and inherited
  classes by removing 'Cpu' from aliases.
* New renamed classes: ConstTensorHandle, TensorHandle,
  ScopedTensorHandle, PassthroughTensorHandle,
  ConstPassthroughTensorHandle.

Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: I1824e0e134202735fb77051f20a7252f161dfe16
---
 src/backends/backendsCommon/test/CommonTestUtils.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/backends/backendsCommon/test/CommonTestUtils.hpp')

diff --git a/src/backends/backendsCommon/test/CommonTestUtils.hpp b/src/backends/backendsCommon/test/CommonTestUtils.hpp
index 8c4da621ed..99412b9694 100644
--- a/src/backends/backendsCommon/test/CommonTestUtils.hpp
+++ b/src/backends/backendsCommon/test/CommonTestUtils.hpp
@@ -13,7 +13,7 @@
 #include <armnn/BackendRegistry.hpp>
 
 #include <armnn/Types.hpp>
-#include <backendsCommon/CpuTensorHandle.hpp>
+#include <backendsCommon/TensorHandle.hpp>
 
 #include <test/TestUtils.hpp>
 
@@ -72,8 +72,8 @@ bool Compare(T a, T b, float tolerance = 0.000001f)
 template <typename ConvolutionLayer>
 void SetWeightAndBias(ConvolutionLayer* layer, const armnn::TensorInfo& weightInfo, const armnn::TensorInfo& biasInfo)
 {
-    layer->m_Weight = std::make_unique<armnn::ScopedCpuTensorHandle>(weightInfo);
-    layer->m_Bias   = std::make_unique<armnn::ScopedCpuTensorHandle>(biasInfo);
+    layer->m_Weight = std::make_unique<armnn::ScopedTensorHandle>(weightInfo);
+    layer->m_Bias   = std::make_unique<armnn::ScopedTensorHandle>(biasInfo);
 
     layer->m_Weight->Allocate();
     layer->m_Bias->Allocate();
-- 
cgit v1.2.1