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/armnn/layers/LstmLayer.hpp | 44 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/armnn/layers/LstmLayer.hpp')

diff --git a/src/armnn/layers/LstmLayer.hpp b/src/armnn/layers/LstmLayer.hpp
index 80b57a88f7..f711ea7607 100644
--- a/src/armnn/layers/LstmLayer.hpp
+++ b/src/armnn/layers/LstmLayer.hpp
@@ -9,68 +9,68 @@
 namespace armnn
 {
 
-class ScopedCpuTensorHandle;
+class ScopedTensorHandle;
 
 struct LstmOptLayerNormParameters
 {
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputLayerNormWeights;
+    std::shared_ptr<ConstTensorHandle> m_InputLayerNormWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_ForgetLayerNormWeights;
+    std::shared_ptr<ConstTensorHandle> m_ForgetLayerNormWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_CellLayerNormWeights;
+    std::shared_ptr<ConstTensorHandle> m_CellLayerNormWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_OutputLayerNormWeights;
+    std::shared_ptr<ConstTensorHandle> m_OutputLayerNormWeights;
 };
 
 struct LstmOptCifgParameters
 {
     /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputToInputWeights;
+    std::shared_ptr<ConstTensorHandle> m_InputToInputWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_RecurrentToInputWeights;
+    std::shared_ptr<ConstTensorHandle> m_RecurrentToInputWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputGateBias;
+    std::shared_ptr<ConstTensorHandle> m_InputGateBias;
 };
 
 struct LstmOptProjectionParameters
 {
     /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_ProjectionWeights;
+    std::shared_ptr<ConstTensorHandle> m_ProjectionWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [output_size].
-    std::shared_ptr<ConstCpuTensorHandle> m_ProjectionBias;
+    std::shared_ptr<ConstTensorHandle> m_ProjectionBias;
 };
 
 struct LstmOptPeepholeParameters
 {
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_CellToInputWeights;
+    std::shared_ptr<ConstTensorHandle> m_CellToInputWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_CellToForgetWeights;
+    std::shared_ptr<ConstTensorHandle> m_CellToForgetWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_CellToOutputWeights;
+    std::shared_ptr<ConstTensorHandle> m_CellToOutputWeights;
 };
 
 struct LstmBasicParameters
 {
     /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputToForgetWeights;
+    std::shared_ptr<ConstTensorHandle> m_InputToForgetWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputToCellWeights;
+    std::shared_ptr<ConstTensorHandle> m_InputToCellWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_InputToOutputWeights;
+    std::shared_ptr<ConstTensorHandle> m_InputToOutputWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_RecurrentToForgetWeights;
+    std::shared_ptr<ConstTensorHandle> m_RecurrentToForgetWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_RecurrentToCellWeights;
+    std::shared_ptr<ConstTensorHandle> m_RecurrentToCellWeights;
     /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_RecurrentToOutputWeights;
+    std::shared_ptr<ConstTensorHandle> m_RecurrentToOutputWeights;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_ForgetGateBias;
+    std::shared_ptr<ConstTensorHandle> m_ForgetGateBias;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_CellBias;
+    std::shared_ptr<ConstTensorHandle> m_CellBias;
     /// A unique pointer to represent 1D weights tensor with dimensions [num_units].
-    std::shared_ptr<ConstCpuTensorHandle> m_OutputGateBias;
+    std::shared_ptr<ConstTensorHandle> m_OutputGateBias;
 };
 
 /// This layer represents a LSTM operation.
-- 
cgit v1.2.1