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 --- .../neon/workloads/NeonLstmFloatWorkload.cpp | 42 +++++++++++----------- .../neon/workloads/NeonQuantizedLstmWorkload.cpp | 24 ++++++------- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/backends/neon/workloads') diff --git a/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp b/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp index 6dd9f4f698..2f29610e71 100644 --- a/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonLstmFloatWorkload.cpp @@ -291,23 +291,23 @@ arm_compute::Status NeonLstmFloatWorkloadValidate(const TensorInfo& input, // Basic parameters const arm_compute::TensorInfo aclInputToForgetWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToForgetWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToForgetWeights()); const arm_compute::TensorInfo aclInputToCellWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToCellWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToCellWeights()); const arm_compute::TensorInfo aclInputToOutputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToOutputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToOutputWeights()); const arm_compute::TensorInfo aclRecurrentToForgetWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToForgetWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToForgetWeights()); const arm_compute::TensorInfo aclRecurrentToCellWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToCellWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToCellWeights()); const arm_compute::TensorInfo aclRecurrentToOutputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToOutputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToOutputWeights()); const arm_compute::TensorInfo aclForgetGateBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_ForgetGateBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetForgetGateBias()); const arm_compute::TensorInfo aclCellBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_CellBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetCellBias()); const arm_compute::TensorInfo aclOutputGateBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_OutputGateBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetOutputGateBias()); arm_compute::TensorInfo aclInputToInputWeightsInfo; arm_compute::TensorInfo aclRecurrentToInputWeightsInfo; @@ -328,11 +328,11 @@ arm_compute::Status NeonLstmFloatWorkloadValidate(const TensorInfo& input, { if (descriptor.m_PeepholeEnabled) { - aclCellToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_CellToInputWeights()); + aclCellToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetCellToInputWeights()); } - aclInputToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_InputToInputWeights()); - aclRecurrentToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToInputWeights()); - aclInputGateBiasInfo = BuildArmComputeTensorInfo(paramsInfo.get_InputGateBias()); + aclInputToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetInputToInputWeights()); + aclRecurrentToInputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToInputWeights()); + aclInputGateBiasInfo = BuildArmComputeTensorInfo(paramsInfo.GetInputGateBias()); lstm_params_info.set_cifg_params(&aclInputToInputWeightsInfo, &aclRecurrentToInputWeightsInfo, descriptor.m_PeepholeEnabled ? &aclCellToInputWeightsInfo : nullptr, @@ -343,9 +343,9 @@ arm_compute::Status NeonLstmFloatWorkloadValidate(const TensorInfo& input, { if (paramsInfo.m_ProjectionBias != nullptr) { - aclProjectionBiasInfo = BuildArmComputeTensorInfo(paramsInfo.get_ProjectionBias()); + aclProjectionBiasInfo = BuildArmComputeTensorInfo(paramsInfo.GetProjectionBias()); } - aclProjectionWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_ProjectionWeights()); + aclProjectionWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetProjectionWeights()); lstm_params_info.set_projection_params(&aclProjectionWeightsInfo, paramsInfo.m_ProjectionBias != nullptr ? @@ -354,8 +354,8 @@ arm_compute::Status NeonLstmFloatWorkloadValidate(const TensorInfo& input, if (descriptor.m_PeepholeEnabled) { - aclCellToForgetWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_CellToForgetWeights()); - aclCellToOutputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_CellToOutputWeights()); + aclCellToForgetWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetCellToForgetWeights()); + aclCellToOutputWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetCellToOutputWeights()); lstm_params_info.set_peephole_params(&aclCellToForgetWeightsInfo, &aclCellToOutputWeightsInfo); } @@ -364,11 +364,11 @@ arm_compute::Status NeonLstmFloatWorkloadValidate(const TensorInfo& input, { if (!descriptor.m_CifgEnabled) { - aclInputLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_InputLayerNormWeights()); + aclInputLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetInputLayerNormWeights()); } - aclForgetLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_ForgetLayerNormWeights()); - aclCellLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_CellLayerNormWeights()); - aclOutputLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.get_OutputLayerNormWeights()); + aclForgetLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetForgetLayerNormWeights()); + aclCellLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetCellLayerNormWeights()); + aclOutputLayerNormWeightsInfo = BuildArmComputeTensorInfo(paramsInfo.GetOutputLayerNormWeights()); lstm_params_info.set_layer_normalization_params(descriptor.m_CifgEnabled ? nullptr : &aclInputLayerNormWeightsInfo, diff --git a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp index d4319d414d..4c2ba7513d 100644 --- a/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp +++ b/src/backends/neon/workloads/NeonQuantizedLstmWorkload.cpp @@ -143,31 +143,31 @@ arm_compute::Status NeonQuantizedLstmWorkloadValidate(const TensorInfo& input, // Basic parameters const arm_compute::TensorInfo aclInputToInputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToInputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToInputWeights()); const arm_compute::TensorInfo aclInputToForgetWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToForgetWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToForgetWeights()); const arm_compute::TensorInfo aclInputToCellWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToCellWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToCellWeights()); const arm_compute::TensorInfo aclInputToOutputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputToOutputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputToOutputWeights()); const arm_compute::TensorInfo aclRecurrentToInputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToInputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToInputWeights()); const arm_compute::TensorInfo aclRecurrentToForgetWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToForgetWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToForgetWeights()); const arm_compute::TensorInfo aclRecurrentToCellWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToCellWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToCellWeights()); const arm_compute::TensorInfo aclRecurrentToOutputWeightsInfo - = BuildArmComputeTensorInfo(paramsInfo.get_RecurrentToOutputWeights()); + = BuildArmComputeTensorInfo(paramsInfo.GetRecurrentToOutputWeights()); const arm_compute::TensorInfo aclInputGateBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_InputGateBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetInputGateBias()); const arm_compute::TensorInfo aclForgetGateBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_ForgetGateBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetForgetGateBias()); const arm_compute::TensorInfo aclCellBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_CellBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetCellBias()); const arm_compute::TensorInfo aclOutputGateBiasInfo - = BuildArmComputeTensorInfo(paramsInfo.get_OutputGateBias()); + = BuildArmComputeTensorInfo(paramsInfo.GetOutputGateBias()); return arm_compute::NELSTMLayerQuantized::validate(&aclInputInfo, &aclInputToInputWeightsInfo, -- cgit v1.2.1