From 1f58f03d82c482626b1b4673b6c0e25da4338fb5 Mon Sep 17 00:00:00 2001 From: James Conroy 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 Change-Id: I1824e0e134202735fb77051f20a7252f161dfe16 --- src/armnn/layers/BatchNormalizationLayer.cpp | 2 +- src/armnn/layers/BatchNormalizationLayer.hpp | 10 +++--- src/armnn/layers/BatchToSpaceNdLayer.cpp | 2 +- src/armnn/layers/ConstantLayer.cpp | 2 +- src/armnn/layers/ConstantLayer.hpp | 4 +-- src/armnn/layers/Convolution2dLayer.cpp | 2 +- src/armnn/layers/Convolution2dLayer.hpp | 6 ++-- src/armnn/layers/DepthwiseConvolution2dLayer.cpp | 2 +- src/armnn/layers/DepthwiseConvolution2dLayer.hpp | 6 ++-- src/armnn/layers/DetectionPostProcessLayer.cpp | 2 +- src/armnn/layers/DetectionPostProcessLayer.hpp | 4 +-- src/armnn/layers/FullyConnectedLayer.cpp | 2 +- src/armnn/layers/FullyConnectedLayer.hpp | 6 ++-- src/armnn/layers/LstmLayer.cpp | 2 +- src/armnn/layers/LstmLayer.hpp | 44 ++++++++++++------------ src/armnn/layers/MeanLayer.cpp | 2 +- src/armnn/layers/PadLayer.cpp | 2 +- src/armnn/layers/PreluLayer.cpp | 2 +- src/armnn/layers/QLstmLayer.cpp | 2 +- src/armnn/layers/QLstmLayer.hpp | 44 ++++++++++++------------ src/armnn/layers/QuantizedLstmLayer.cpp | 2 +- src/armnn/layers/QuantizedLstmLayer.hpp | 26 +++++++------- src/armnn/layers/TransposeConvolution2dLayer.cpp | 2 +- src/armnn/layers/TransposeConvolution2dLayer.hpp | 6 ++-- 24 files changed, 92 insertions(+), 92 deletions(-) (limited to 'src/armnn/layers') diff --git a/src/armnn/layers/BatchNormalizationLayer.cpp b/src/armnn/layers/BatchNormalizationLayer.cpp index 83ed45aa33..e3ee643ac5 100644 --- a/src/armnn/layers/BatchNormalizationLayer.cpp +++ b/src/armnn/layers/BatchNormalizationLayer.cpp @@ -7,7 +7,7 @@ #include "LayerCloneBase.hpp" #include -#include +#include #include namespace armnn diff --git a/src/armnn/layers/BatchNormalizationLayer.hpp b/src/armnn/layers/BatchNormalizationLayer.hpp index bf9e4b7917..2777633a34 100644 --- a/src/armnn/layers/BatchNormalizationLayer.hpp +++ b/src/armnn/layers/BatchNormalizationLayer.hpp @@ -9,20 +9,20 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a batch normalization operation. class BatchNormalizationLayer : public LayerWithParameters { public: /// A unique pointer to store Mean values - std::shared_ptr m_Mean; + std::shared_ptr m_Mean; /// A unique pointer to store Variance values - std::shared_ptr m_Variance; + std::shared_ptr m_Variance; /// A unique pointer to store Beta values - std::shared_ptr m_Beta; + std::shared_ptr m_Beta; /// A unique pointer to store Gamma values - std::shared_ptr m_Gamma; + std::shared_ptr m_Gamma; /// Makes a workload for the BatchNormalization type. /// @param [in] graph The graph where this layer can be found. diff --git a/src/armnn/layers/BatchToSpaceNdLayer.cpp b/src/armnn/layers/BatchToSpaceNdLayer.cpp index a13b0b731a..4b33b96229 100644 --- a/src/armnn/layers/BatchToSpaceNdLayer.cpp +++ b/src/armnn/layers/BatchToSpaceNdLayer.cpp @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/src/armnn/layers/ConstantLayer.cpp b/src/armnn/layers/ConstantLayer.cpp index eb28187d25..feeb762263 100644 --- a/src/armnn/layers/ConstantLayer.cpp +++ b/src/armnn/layers/ConstantLayer.cpp @@ -6,7 +6,7 @@ #include "LayerCloneBase.hpp" #include -#include +#include #include #include diff --git a/src/armnn/layers/ConstantLayer.hpp b/src/armnn/layers/ConstantLayer.hpp index ff4c03775f..ead8816684 100644 --- a/src/armnn/layers/ConstantLayer.hpp +++ b/src/armnn/layers/ConstantLayer.hpp @@ -9,7 +9,7 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// A layer that the constant data can be bound to. class ConstantLayer : public Layer @@ -43,7 +43,7 @@ public: void ExecuteStrategy(IStrategy& strategy) const override; - std::shared_ptr m_LayerOutput; + std::shared_ptr m_LayerOutput; protected: /// Constructor to create a ConstantLayer. diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index d7a7a330ef..b7bf0462d8 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/src/armnn/layers/Convolution2dLayer.hpp b/src/armnn/layers/Convolution2dLayer.hpp index 2d5ab194de..a33cda27cb 100644 --- a/src/armnn/layers/Convolution2dLayer.hpp +++ b/src/armnn/layers/Convolution2dLayer.hpp @@ -9,7 +9,7 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a convolution 2d operation. class Convolution2dLayer : public LayerWithParameters @@ -17,9 +17,9 @@ class Convolution2dLayer : public LayerWithParameters public: /// A unique pointer to store Weight values. - std::shared_ptr m_Weight; + std::shared_ptr m_Weight; /// A unique pointer to store Bias values. - std::shared_ptr m_Bias; + std::shared_ptr m_Bias; /// Makes a workload for the Convolution2d type. /// @param [in] graph The graph where this layer can be found. diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index 3511ab58d0..b96c567504 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp index c83aa434d5..51f6ea9453 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp @@ -9,16 +9,16 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a depthwise convolution 2d operation. class DepthwiseConvolution2dLayer : public LayerWithParameters { public: /// A unique pointer to store Weight values. - std::shared_ptr m_Weight; + std::shared_ptr m_Weight; /// A unique pointer to store Bias values. - std::shared_ptr m_Bias; + std::shared_ptr m_Bias; /// Makes a workload for the DepthwiseConvolution2d type. /// @param [in] graph The graph where this layer can be found. diff --git a/src/armnn/layers/DetectionPostProcessLayer.cpp b/src/armnn/layers/DetectionPostProcessLayer.cpp index b5086172dd..bd94d1d281 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.cpp +++ b/src/armnn/layers/DetectionPostProcessLayer.cpp @@ -8,7 +8,7 @@ #include "LayerCloneBase.hpp" #include -#include +#include #include #include diff --git a/src/armnn/layers/DetectionPostProcessLayer.hpp b/src/armnn/layers/DetectionPostProcessLayer.hpp index e40966a19c..b409134c1c 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.hpp +++ b/src/armnn/layers/DetectionPostProcessLayer.hpp @@ -10,14 +10,14 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a detection postprocess operator. class DetectionPostProcessLayer : public LayerWithParameters { public: /// A unique pointer to store Anchor values. - std::shared_ptr m_Anchors; + std::shared_ptr m_Anchors; /// Makes a workload for the DetectionPostProcess type. /// @param [in] graph The graph where this layer can be found. diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp index 79d56c0bd7..9d4f57d260 100644 --- a/src/armnn/layers/FullyConnectedLayer.cpp +++ b/src/armnn/layers/FullyConnectedLayer.cpp @@ -7,7 +7,7 @@ #include "LayerCloneBase.hpp" #include -#include +#include #include #include diff --git a/src/armnn/layers/FullyConnectedLayer.hpp b/src/armnn/layers/FullyConnectedLayer.hpp index c45b081c85..7fc7b0d596 100644 --- a/src/armnn/layers/FullyConnectedLayer.hpp +++ b/src/armnn/layers/FullyConnectedLayer.hpp @@ -9,16 +9,16 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a fully connected operation. class FullyConnectedLayer : public LayerWithParameters { public: /// A unique pointer to store Weight values. - std::shared_ptr m_Weight; + std::shared_ptr m_Weight; /// A unique pointer to store Bias values. - std::shared_ptr m_Bias; + std::shared_ptr m_Bias; /// Makes a workload for the FullyConnected type. /// @param [in] graph The graph where this layer can be found. diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp index 403d911e7e..0fea668b97 100644 --- a/src/armnn/layers/LstmLayer.cpp +++ b/src/armnn/layers/LstmLayer.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace armnn 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 m_InputLayerNormWeights; + std::shared_ptr m_InputLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_ForgetLayerNormWeights; + std::shared_ptr m_ForgetLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_CellLayerNormWeights; + std::shared_ptr m_CellLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_OutputLayerNormWeights; + std::shared_ptr m_OutputLayerNormWeights; }; struct LstmOptCifgParameters { /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units]. - std::shared_ptr m_InputToInputWeights; + std::shared_ptr m_InputToInputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units]. - std::shared_ptr m_RecurrentToInputWeights; + std::shared_ptr m_RecurrentToInputWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_InputGateBias; + std::shared_ptr m_InputGateBias; }; struct LstmOptProjectionParameters { /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units]. - std::shared_ptr m_ProjectionWeights; + std::shared_ptr m_ProjectionWeights; /// A unique pointer to represent 1D weights tensor with dimensions [output_size]. - std::shared_ptr m_ProjectionBias; + std::shared_ptr m_ProjectionBias; }; struct LstmOptPeepholeParameters { /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_CellToInputWeights; + std::shared_ptr m_CellToInputWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_CellToForgetWeights; + std::shared_ptr m_CellToForgetWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_CellToOutputWeights; + std::shared_ptr m_CellToOutputWeights; }; struct LstmBasicParameters { /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units]. - std::shared_ptr m_InputToForgetWeights; + std::shared_ptr m_InputToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units]. - std::shared_ptr m_InputToCellWeights; + std::shared_ptr m_InputToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units]. - std::shared_ptr m_InputToOutputWeights; + std::shared_ptr m_InputToOutputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units]. - std::shared_ptr m_RecurrentToForgetWeights; + std::shared_ptr m_RecurrentToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units]. - std::shared_ptr m_RecurrentToCellWeights; + std::shared_ptr m_RecurrentToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units]. - std::shared_ptr m_RecurrentToOutputWeights; + std::shared_ptr m_RecurrentToOutputWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_ForgetGateBias; + std::shared_ptr m_ForgetGateBias; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_CellBias; + std::shared_ptr m_CellBias; /// A unique pointer to represent 1D weights tensor with dimensions [num_units]. - std::shared_ptr m_OutputGateBias; + std::shared_ptr m_OutputGateBias; }; /// This layer represents a LSTM operation. diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp index b5c7708fc3..9d4265cdcf 100644 --- a/src/armnn/layers/MeanLayer.cpp +++ b/src/armnn/layers/MeanLayer.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp index f620a6e9a4..2c53f20703 100644 --- a/src/armnn/layers/PadLayer.cpp +++ b/src/armnn/layers/PadLayer.cpp @@ -6,7 +6,7 @@ #include "PadLayer.hpp" #include "LayerCloneBase.hpp" -#include +#include #include #include diff --git a/src/armnn/layers/PreluLayer.cpp b/src/armnn/layers/PreluLayer.cpp index f9f534e648..18d81ae9b6 100644 --- a/src/armnn/layers/PreluLayer.cpp +++ b/src/armnn/layers/PreluLayer.cpp @@ -9,9 +9,9 @@ #include +#include #include #include -#include namespace armnn { diff --git a/src/armnn/layers/QLstmLayer.cpp b/src/armnn/layers/QLstmLayer.cpp index 72b020f109..0294afdc0d 100644 --- a/src/armnn/layers/QLstmLayer.cpp +++ b/src/armnn/layers/QLstmLayer.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace armnn diff --git a/src/armnn/layers/QLstmLayer.hpp b/src/armnn/layers/QLstmLayer.hpp index 09a020dc1d..38a0464da6 100644 --- a/src/armnn/layers/QLstmLayer.hpp +++ b/src/armnn/layers/QLstmLayer.hpp @@ -9,70 +9,70 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; struct QLstmBasicParameters { /// A unique pointer to represent 2D weights tensor with dimensions [num_units, inputSize] (QSymmS8). - std::shared_ptr m_InputToForgetWeights; + std::shared_ptr m_InputToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [num_units, inputSize] (QSymmS8). - std::shared_ptr m_InputToCellWeights; + std::shared_ptr m_InputToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [num_units, inputSize] (QSymmS8). - std::shared_ptr m_InputToOutputWeights; + std::shared_ptr m_InputToOutputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [num_units, outputSize] (QSymmS8). - std::shared_ptr m_RecurrentToForgetWeights; + std::shared_ptr m_RecurrentToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [num_units, outputSize] (QSymmS8). - std::shared_ptr m_RecurrentToCellWeights; + std::shared_ptr m_RecurrentToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [num_units, outputSize] (QSymmS8). - std::shared_ptr m_RecurrentToOutputWeights; + std::shared_ptr m_RecurrentToOutputWeights; /// A unique pointer to represent 1D bias tensor with dimensions [num_units] (int32). - std::shared_ptr m_ForgetGateBias; + std::shared_ptr m_ForgetGateBias; /// A unique pointer to represent 1D bias tensor with dimensions [num_units] (int32). - std::shared_ptr m_CellBias; + std::shared_ptr m_CellBias; /// A unique pointer to represent 1D bias tensor with dimensions [num_units] (int32). - std::shared_ptr m_OutputGateBias; + std::shared_ptr m_OutputGateBias; }; struct QLstmOptProjectionParameters { /// A unique pointer to represent 2D weights tensor with dimensions [output_size, num_units] (QSymmS8). - std::shared_ptr m_ProjectionWeights; + std::shared_ptr m_ProjectionWeights; /// A unique pointer to represent 1D weights tensor with dimensions [output_size] (int32). - std::shared_ptr m_ProjectionBias; + std::shared_ptr m_ProjectionBias; }; struct QLstmOptPeepholeParameters { /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_CellToInputWeights; + std::shared_ptr m_CellToInputWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_CellToForgetWeights; + std::shared_ptr m_CellToForgetWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_CellToOutputWeights; + std::shared_ptr m_CellToOutputWeights; }; struct QLstmOptCifgParameters { /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units] (QSymmS8). - std::shared_ptr m_InputToInputWeights; + std::shared_ptr m_InputToInputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [input_size, num_units] (QSymmS8). - std::shared_ptr m_RecurrentToInputWeights; + std::shared_ptr m_RecurrentToInputWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (int32). - std::shared_ptr m_InputGateBias; + std::shared_ptr m_InputGateBias; }; struct QLstmOptLayerNormParameters { /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_InputLayerNormWeights; + std::shared_ptr m_InputLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_ForgetLayerNormWeights; + std::shared_ptr m_ForgetLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_CellLayerNormWeights; + std::shared_ptr m_CellLayerNormWeights; /// A unique pointer to represent 1D weights tensor with dimensions [num_units] (QSymmS16). - std::shared_ptr m_OutputLayerNormWeights; + std::shared_ptr m_OutputLayerNormWeights; }; /// This layer represents a QLstm operation. diff --git a/src/armnn/layers/QuantizedLstmLayer.cpp b/src/armnn/layers/QuantizedLstmLayer.cpp index 4d0dab9505..be50f4863b 100644 --- a/src/armnn/layers/QuantizedLstmLayer.cpp +++ b/src/armnn/layers/QuantizedLstmLayer.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace armnn diff --git a/src/armnn/layers/QuantizedLstmLayer.hpp b/src/armnn/layers/QuantizedLstmLayer.hpp index ca97a6bb65..25cc7b7d8b 100644 --- a/src/armnn/layers/QuantizedLstmLayer.hpp +++ b/src/armnn/layers/QuantizedLstmLayer.hpp @@ -9,36 +9,36 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; struct QuantizedLstmParameters { /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, inputSize] (QAsymm8). - std::shared_ptr m_InputToInputWeights; + std::shared_ptr m_InputToInputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, inputSize] (QAsymm8). - std::shared_ptr m_InputToForgetWeights; + std::shared_ptr m_InputToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, inputSize] (QAsymm8). - std::shared_ptr m_InputToCellWeights; + std::shared_ptr m_InputToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, inputSize] (QAsymm8). - std::shared_ptr m_InputToOutputWeights; + std::shared_ptr m_InputToOutputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, outputSize] (QAsymm8). - std::shared_ptr m_RecurrentToInputWeights; + std::shared_ptr m_RecurrentToInputWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, outputSize] (QAsymm8). - std::shared_ptr m_RecurrentToForgetWeights; + std::shared_ptr m_RecurrentToForgetWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, outputSize] (QAsymm8). - std::shared_ptr m_RecurrentToCellWeights; + std::shared_ptr m_RecurrentToCellWeights; /// A unique pointer to represent 2D weights tensor with dimensions [outputSize, outputSize] (QAsymm8). - std::shared_ptr m_RecurrentToOutputWeights; + std::shared_ptr m_RecurrentToOutputWeights; /// A unique pointer to represent 1D bias tensor with dimensions [outputSize] (int32). - std::shared_ptr m_InputGateBias; + std::shared_ptr m_InputGateBias; /// A unique pointer to represent 1D bias tensor with dimensions [outputSize] (int32). - std::shared_ptr m_ForgetGateBias; + std::shared_ptr m_ForgetGateBias; /// A unique pointer to represent 1D bias tensor with dimensions [outputSize] (int32). - std::shared_ptr m_CellBias; + std::shared_ptr m_CellBias; /// A unique pointer to represent 1D bias tensor with dimensions [outputSize] (int32). - std::shared_ptr m_OutputGateBias; + std::shared_ptr m_OutputGateBias; }; /// This layer represents a QuantizedLstm operation. diff --git a/src/armnn/layers/TransposeConvolution2dLayer.cpp b/src/armnn/layers/TransposeConvolution2dLayer.cpp index c0a7dfa1cd..c774dd0bbf 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.cpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include using namespace armnnUtils; diff --git a/src/armnn/layers/TransposeConvolution2dLayer.hpp b/src/armnn/layers/TransposeConvolution2dLayer.hpp index 53e73491d6..1b17dac3c6 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.hpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.hpp @@ -9,16 +9,16 @@ namespace armnn { -class ScopedCpuTensorHandle; +class ScopedTensorHandle; /// This layer represents a 2D transpose convolution operation. class TransposeConvolution2dLayer : public LayerWithParameters { public: /// A unique pointer to store weight values. - std::shared_ptr m_Weight; + std::shared_ptr m_Weight; /// A unique pointer to store bias values. - std::shared_ptr m_Bias; + std::shared_ptr m_Bias; /// Makes a workload for the TransposeConvolution2d type. /// @param [in] graph The graph where this layer can be found. -- cgit v1.2.1