From bb590b42b6a877e7caf0c5e73070bab42f44c760 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Wed, 14 Aug 2019 09:51:36 +0100 Subject: IVGCVSW-3474 Refactor Lstm and QuantizedLstm Param Getters * Change Getter Signatures to follow coding guidelines Change-Id: Ic02621e834dbf79b9df63f8b4c6339f71651e944 Signed-off-by: Francis Murtagh --- include/armnn/LstmParams.hpp | 86 ++++++++++++++--------------- include/armnn/QuantizedLstmParams.hpp | 100 +++++++++++++++++----------------- 2 files changed, 93 insertions(+), 93 deletions(-) (limited to 'include/armnn') diff --git a/include/armnn/LstmParams.hpp b/include/armnn/LstmParams.hpp index 0c8e66dfde..89f37ab234 100644 --- a/include/armnn/LstmParams.hpp +++ b/include/armnn/LstmParams.hpp @@ -108,7 +108,7 @@ struct LstmInputParamsInfo const TensorInfo* m_CellLayerNormWeights; const TensorInfo* m_OutputLayerNormWeights; - const TensorInfo& deref(const TensorInfo* tensorInfo) const + const TensorInfo& Deref(const TensorInfo* tensorInfo) const { if (tensorInfo != nullptr) { @@ -118,89 +118,89 @@ struct LstmInputParamsInfo throw InvalidArgumentException("Can't dereference a null pointer"); } - const TensorInfo& get_InputToInputWeights() const + const TensorInfo& GetInputToInputWeights() const { - return deref(m_InputToInputWeights); + return Deref(m_InputToInputWeights); } - const TensorInfo& get_InputToForgetWeights() const + const TensorInfo& GetInputToForgetWeights() const { - return deref(m_InputToForgetWeights); + return Deref(m_InputToForgetWeights); } - const TensorInfo& get_InputToCellWeights() const + const TensorInfo& GetInputToCellWeights() const { - return deref(m_InputToCellWeights); + return Deref(m_InputToCellWeights); } - const TensorInfo& get_InputToOutputWeights() const + const TensorInfo& GetInputToOutputWeights() const { - return deref(m_InputToOutputWeights); + return Deref(m_InputToOutputWeights); } - const TensorInfo& get_RecurrentToInputWeights() const + const TensorInfo& GetRecurrentToInputWeights() const { - return deref(m_RecurrentToInputWeights); + return Deref(m_RecurrentToInputWeights); } - const TensorInfo& get_RecurrentToForgetWeights() const + const TensorInfo& GetRecurrentToForgetWeights() const { - return deref(m_RecurrentToForgetWeights); + return Deref(m_RecurrentToForgetWeights); } - const TensorInfo& get_RecurrentToCellWeights() const + const TensorInfo& GetRecurrentToCellWeights() const { - return deref(m_RecurrentToCellWeights); + return Deref(m_RecurrentToCellWeights); } - const TensorInfo& get_RecurrentToOutputWeights() const + const TensorInfo& GetRecurrentToOutputWeights() const { - return deref(m_RecurrentToOutputWeights); + return Deref(m_RecurrentToOutputWeights); } - const TensorInfo& get_CellToInputWeights() const + const TensorInfo& GetCellToInputWeights() const { - return deref(m_CellToInputWeights); + return Deref(m_CellToInputWeights); } - const TensorInfo& get_CellToForgetWeights() const + const TensorInfo& GetCellToForgetWeights() const { - return deref(m_CellToForgetWeights); + return Deref(m_CellToForgetWeights); } - const TensorInfo& get_CellToOutputWeights() const + const TensorInfo& GetCellToOutputWeights() const { - return deref(m_CellToOutputWeights); + return Deref(m_CellToOutputWeights); } - const TensorInfo& get_InputGateBias() const + const TensorInfo& GetInputGateBias() const { - return deref(m_InputGateBias); + return Deref(m_InputGateBias); } - const TensorInfo& get_ForgetGateBias() const + const TensorInfo& GetForgetGateBias() const { - return deref(m_ForgetGateBias); + return Deref(m_ForgetGateBias); } - const TensorInfo& get_CellBias() const + const TensorInfo& GetCellBias() const { - return deref(m_CellBias); + return Deref(m_CellBias); } - const TensorInfo& get_OutputGateBias() const + const TensorInfo& GetOutputGateBias() const { - return deref(m_OutputGateBias); + return Deref(m_OutputGateBias); } - const TensorInfo& get_ProjectionWeights() const + const TensorInfo& GetProjectionWeights() const { - return deref(m_ProjectionWeights); + return Deref(m_ProjectionWeights); } - const TensorInfo& get_ProjectionBias() const + const TensorInfo& GetProjectionBias() const { - return deref(m_ProjectionBias); + return Deref(m_ProjectionBias); } - const TensorInfo& get_InputLayerNormWeights() const + const TensorInfo& GetInputLayerNormWeights() const { - return deref(m_InputLayerNormWeights); + return Deref(m_InputLayerNormWeights); } - const TensorInfo& get_ForgetLayerNormWeights() const + const TensorInfo& GetForgetLayerNormWeights() const { - return deref(m_ForgetLayerNormWeights); + return Deref(m_ForgetLayerNormWeights); } - const TensorInfo& get_CellLayerNormWeights() const + const TensorInfo& GetCellLayerNormWeights() const { - return deref(m_CellLayerNormWeights); + return Deref(m_CellLayerNormWeights); } - const TensorInfo& get_OutputLayerNormWeights() const + const TensorInfo& GetOutputLayerNormWeights() const { - return deref(m_OutputLayerNormWeights); + return Deref(m_OutputLayerNormWeights); } }; diff --git a/include/armnn/QuantizedLstmParams.hpp b/include/armnn/QuantizedLstmParams.hpp index b3033acc9a..f68e607dac 100644 --- a/include/armnn/QuantizedLstmParams.hpp +++ b/include/armnn/QuantizedLstmParams.hpp @@ -45,7 +45,7 @@ struct QuantizedLstmInputParams const ConstTensor* m_CellBias; const ConstTensor* m_OutputGateBias; - const ConstTensor& deref(const ConstTensor* tensorPtr) const + const ConstTensor& Deref(const ConstTensor* tensorPtr) const { if (tensorPtr != nullptr) { @@ -55,64 +55,64 @@ struct QuantizedLstmInputParams throw InvalidArgumentException("QuantizedLstmInputParams: Can't dereference a null pointer"); } - const ConstTensor& get_InputToInputWeights() const + const ConstTensor& GetInputToInputWeights() const { - return deref(m_InputToInputWeights); + return Deref(m_InputToInputWeights); } - const ConstTensor& get_InputToForgetWeights() const + const ConstTensor& GetInputToForgetWeights() const { - return deref(m_InputToForgetWeights); + return Deref(m_InputToForgetWeights); } - const ConstTensor& get_InputToCellWeights() const + const ConstTensor& GetInputToCellWeights() const { - return deref(m_InputToCellWeights); + return Deref(m_InputToCellWeights); } - const ConstTensor& get_InputToOutputWeights() const + const ConstTensor& GetInputToOutputWeights() const { - return deref(m_InputToOutputWeights); + return Deref(m_InputToOutputWeights); } - const ConstTensor& get_RecurrentToInputWeights() const + const ConstTensor& GetRecurrentToInputWeights() const { - return deref(m_RecurrentToInputWeights); + return Deref(m_RecurrentToInputWeights); } - const ConstTensor& get_RecurrentToForgetWeights() const + const ConstTensor& GetRecurrentToForgetWeights() const { - return deref(m_RecurrentToForgetWeights); + return Deref(m_RecurrentToForgetWeights); } - const ConstTensor& get_RecurrentToCellWeights() const + const ConstTensor& GetRecurrentToCellWeights() const { - return deref(m_RecurrentToCellWeights); + return Deref(m_RecurrentToCellWeights); } - const ConstTensor& get_RecurrentToOutputWeights() const + const ConstTensor& GetRecurrentToOutputWeights() const { - return deref(m_RecurrentToOutputWeights); + return Deref(m_RecurrentToOutputWeights); } - const ConstTensor& get_InputGateBias() const + const ConstTensor& GetInputGateBias() const { - return deref(m_InputGateBias); + return Deref(m_InputGateBias); } - const ConstTensor& get_ForgetGateBias() const + const ConstTensor& GetForgetGateBias() const { - return deref(m_ForgetGateBias); + return Deref(m_ForgetGateBias); } - const ConstTensor& get_CellBias() const + const ConstTensor& GetCellBias() const { - return deref(m_CellBias); + return Deref(m_CellBias); } - const ConstTensor& get_OutputGateBias() const + const ConstTensor& GetOutputGateBias() const { - return deref(m_OutputGateBias); + return Deref(m_OutputGateBias); } }; @@ -152,7 +152,7 @@ struct QuantizedLstmInputParamsInfo const TensorInfo* m_OutputGateBias; - const TensorInfo& deref(const TensorInfo* tensorInfo) const + const TensorInfo& Deref(const TensorInfo* tensorInfo) const { if (tensorInfo != nullptr) { @@ -162,55 +162,55 @@ struct QuantizedLstmInputParamsInfo throw InvalidArgumentException("Can't dereference a null pointer"); } - const TensorInfo& get_InputToInputWeights() const + const TensorInfo& GetInputToInputWeights() const { - return deref(m_InputToInputWeights); + return Deref(m_InputToInputWeights); } - const TensorInfo& get_InputToForgetWeights() const + const TensorInfo& GetInputToForgetWeights() const { - return deref(m_InputToForgetWeights); + return Deref(m_InputToForgetWeights); } - const TensorInfo& get_InputToCellWeights() const + const TensorInfo& GetInputToCellWeights() const { - return deref(m_InputToCellWeights); + return Deref(m_InputToCellWeights); } - const TensorInfo& get_InputToOutputWeights() const + const TensorInfo& GetInputToOutputWeights() const { - return deref(m_InputToOutputWeights); + return Deref(m_InputToOutputWeights); } - const TensorInfo& get_RecurrentToInputWeights() const + const TensorInfo& GetRecurrentToInputWeights() const { - return deref(m_RecurrentToInputWeights); + return Deref(m_RecurrentToInputWeights); } - const TensorInfo& get_RecurrentToForgetWeights() const + const TensorInfo& GetRecurrentToForgetWeights() const { - return deref(m_RecurrentToForgetWeights); + return Deref(m_RecurrentToForgetWeights); } - const TensorInfo& get_RecurrentToCellWeights() const + const TensorInfo& GetRecurrentToCellWeights() const { - return deref(m_RecurrentToCellWeights); + return Deref(m_RecurrentToCellWeights); } - const TensorInfo& get_RecurrentToOutputWeights() const + const TensorInfo& GetRecurrentToOutputWeights() const { - return deref(m_RecurrentToOutputWeights); + return Deref(m_RecurrentToOutputWeights); } - const TensorInfo& get_InputGateBias() const + const TensorInfo& GetInputGateBias() const { - return deref(m_InputGateBias); + return Deref(m_InputGateBias); } - const TensorInfo& get_ForgetGateBias() const + const TensorInfo& GetForgetGateBias() const { - return deref(m_ForgetGateBias); + return Deref(m_ForgetGateBias); } - const TensorInfo& get_CellBias() const + const TensorInfo& GetCellBias() const { - return deref(m_CellBias); + return Deref(m_CellBias); } - const TensorInfo& get_OutputGateBias() const + const TensorInfo& GetOutputGateBias() const { - return deref(m_OutputGateBias); + return Deref(m_OutputGateBias); } }; -- cgit v1.2.1