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/dynamic/sample/SampleDynamicWorkloadFactory.cpp | 6 +++---
 src/dynamic/sample/SampleTensorHandle.hpp           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/dynamic')

diff --git a/src/dynamic/sample/SampleDynamicWorkloadFactory.cpp b/src/dynamic/sample/SampleDynamicWorkloadFactory.cpp
index ac324946d2..227190cb1b 100644
--- a/src/dynamic/sample/SampleDynamicWorkloadFactory.cpp
+++ b/src/dynamic/sample/SampleDynamicWorkloadFactory.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <backendsCommon/CpuTensorHandle.hpp>
 #include <backendsCommon/MemCopyWorkload.hpp>
+#include <backendsCommon/TensorHandle.hpp>
 
 #include "SampleDynamicAdditionWorkload.hpp"
 #include "SampleDynamicBackend.hpp"
@@ -45,7 +45,7 @@ std::unique_ptr<armnn::ITensorHandle> SampleDynamicWorkloadFactory::CreateTensor
         const armnn::TensorInfo& tensorInfo,
         const bool isMemoryManaged) const
 {
-    return std::make_unique<armnn::ScopedCpuTensorHandle>(tensorInfo);
+    return std::make_unique<armnn::ScopedTensorHandle>(tensorInfo);
 }
 
 std::unique_ptr<armnn::ITensorHandle> SampleDynamicWorkloadFactory::CreateTensorHandle(
@@ -53,7 +53,7 @@ std::unique_ptr<armnn::ITensorHandle> SampleDynamicWorkloadFactory::CreateTensor
         armnn::DataLayout dataLayout,
         const bool isMemoryManaged) const
 {
-    return std::make_unique<armnn::ScopedCpuTensorHandle>(tensorInfo);
+    return std::make_unique<armnn::ScopedTensorHandle>(tensorInfo);
 }
 
 std::unique_ptr<armnn::IWorkload> SampleDynamicWorkloadFactory::CreateAddition(
diff --git a/src/dynamic/sample/SampleTensorHandle.hpp b/src/dynamic/sample/SampleTensorHandle.hpp
index 9ddccedce2..dce98cfc0b 100644
--- a/src/dynamic/sample/SampleTensorHandle.hpp
+++ b/src/dynamic/sample/SampleTensorHandle.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include <backendsCommon/CpuTensorHandle.hpp>
+#include <backendsCommon/TensorHandle.hpp>
 
 #include "SampleMemoryManager.hpp"
 
-- 
cgit v1.2.1