From 30b46a660629ccd5bf715f63b90d6d7655416e2c Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Sat, 18 Apr 2020 01:40:57 +0100 Subject: COMPMID-3241: Fix hidden scale in NEQLSTMLayer - Fix wrong data types in LSTMParams - Add logic to ignore epsilon for quantization multiplier computation - Ignore epsilon for hidden gate scale computation Change-Id: Ia0b2f523b1c2ad325f3523439a8eea051d81958c Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3058 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/core/utils/quantization/AsymmHelpers.h | 6 ++++-- arm_compute/runtime/common/LSTMParams.h | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/core/utils/quantization/AsymmHelpers.h b/arm_compute/core/utils/quantization/AsymmHelpers.h index a7bbf9b137..4ef49476b2 100644 --- a/arm_compute/core/utils/quantization/AsymmHelpers.h +++ b/arm_compute/core/utils/quantization/AsymmHelpers.h @@ -37,19 +37,21 @@ namespace quantization * @param[in] multiplier Real multiplier. * @param[out] quant_multiplier Integer multiplier. * @param[out] shift bit shift. A negative value indicates a left shift, while a positive value indicates a right shift + * @param[in] ignore_epsilon When true, ignore pre-defined epsilon value. Defaults to false * * @return a status */ -Status calculate_quantized_multiplier(float multiplier, int32_t *quant_multiplier, int32_t *shift); +Status calculate_quantized_multiplier(float multiplier, int32_t *quant_multiplier, int32_t *shift, bool ignore_epsilon = false); /** Calculate quantized representation of multiplier with value less than one. * * @param[in] multiplier Real multiplier. * @param[out] quant_multiplier Integer multiplier. * @param[out] right_shift Right bit shift. + * @param[in] ignore_epsilon When true, ignore pre-defined epsilon value. Defaults to false * * @return a status */ -Status calculate_quantized_multiplier_less_than_one(float multiplier, int32_t *quant_multiplier, int32_t *right_shift); +Status calculate_quantized_multiplier_less_than_one(float multiplier, int32_t *quant_multiplier, int32_t *right_shift, bool ignore_epsilon = false); /** Calculate quantized representation of multiplier having value greater than one. * * @param[in] multiplier Real multiplier. diff --git a/arm_compute/runtime/common/LSTMParams.h b/arm_compute/runtime/common/LSTMParams.h index e21ddd7af1..5e4a76afae 100644 --- a/arm_compute/runtime/common/LSTMParams.h +++ b/arm_compute/runtime/common/LSTMParams.h @@ -58,8 +58,8 @@ public: _forget_intermediate_scale(0.0f), _cell_intermediate_scale(0.0f), _output_intermediate_scale(0.0f), - _hidden_state_zero(0.0f), - _hidden_state_scale(0), + _hidden_state_zero(0), + _hidden_state_scale(0.0f), _has_peephole_opt(false), _has_projection(false), _has_cifg_opt(true), @@ -333,8 +333,8 @@ private: float _forget_intermediate_scale; float _cell_intermediate_scale; float _output_intermediate_scale; - float _hidden_state_zero; - int32_t _hidden_state_scale; + int32_t _hidden_state_zero; + float _hidden_state_scale; bool _has_peephole_opt; bool _has_projection; bool _has_cifg_opt; -- cgit v1.2.1