From 09daf4ddf5940d18ce95e7dd0859d1dace3b133e Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 28 Jun 2018 17:07:22 +0100 Subject: COMPMID-1246 Change CLLSTM in order to match android tests Allow cell to input weights to be nullptr if CIFG and peephole are both enabled. Change-Id: I6df705d69551f0fddeedd41b2044278d4575469c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/137902 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- src/runtime/CL/functions/CLLSTMLayer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/runtime/CL/functions/CLLSTMLayer.cpp') diff --git a/src/runtime/CL/functions/CLLSTMLayer.cpp b/src/runtime/CL/functions/CLLSTMLayer.cpp index 930d311d1d..a195ffa6b9 100644 --- a/src/runtime/CL/functions/CLLSTMLayer.cpp +++ b/src/runtime/CL/functions/CLLSTMLayer.cpp @@ -62,7 +62,7 @@ void CLLSTMLayer::configure(const ICLTensor *input, const ICLTensor *input_to_fo LSTMParams lstm_params_info; if(lstm_params.has_peephole_opt()) { - lstm_params_info.set_peephole_params(lstm_params.cell_to_input_weights()->info(), lstm_params.cell_to_forget_weights()->info(), lstm_params.cell_to_output_weights()->info()); + lstm_params_info.set_peephole_params(lstm_params.cell_to_forget_weights()->info(), lstm_params.cell_to_output_weights()->info()); } if(lstm_params.has_projection()) { @@ -332,8 +332,7 @@ Status CLLSTMLayer::validate(const ITensorInfo *input, const ITensorInfo *input_ if(lstm_params.has_peephole_opt()) { - ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(lstm_params.cell_to_input_weights(), lstm_params.cell_to_output_weights(), lstm_params.cell_to_forget_weights()); - ARM_COMPUTE_RETURN_ERROR_ON(lstm_params.cell_to_input_weights()->num_dimensions() != 1); + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(lstm_params.cell_to_output_weights(), lstm_params.cell_to_forget_weights()); ARM_COMPUTE_RETURN_ERROR_ON(lstm_params.cell_to_forget_weights()->num_dimensions() != 1); ARM_COMPUTE_RETURN_ERROR_ON(lstm_params.cell_to_output_weights()->num_dimensions() != 1); } -- cgit v1.2.1