commit 2761c2f0b60175469e959982a25ff0abdca6c9ce
author Michalis Spyrou <michalis.spyrou@arm.com> Fri Mar 22 13:06:08 2019 +0000
committer Michalis Spyrou <michalis.spyrou@arm.com> Mon Mar 25 12:01:36 2019 +0000
tree 02aaace08486b5206f3832473d6075ed1338bb78
parent e214fcfcc61904e042b271bdbea90d1d96833ca8

COMPMID-2075 Segfault in NELSTM

Change-Id: Ice7d7cc878614b5e317c0d006c4429be27f5dc29
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/888
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/runtime/NEON/functions/NELSTMLayer.cpp

diff --git a/src/runtime/NEON/functions/NELSTMLayer.cpp b/src/runtime/NEON/functions/NELSTMLayer.cpp
index 4d93774..a0adbb0 100644
--- a/src/runtime/NEON/functions/NELSTMLayer.cpp
+++ b/src/runtime/NEON/functions/NELSTMLayer.cpp
@@ -92,7 +92,7 @@
                                                      scratch_buffer->info(), output_state_out->info(), cell_state_out->info(), output->info(),
                                                      lstm_params_info, activation_info, cell_threshold, projection_threshold));
 
-    const TensorShape cell_state_shape = cell_state_in->info()->tensor_shape();
+    const TensorShape cell_state_shape   = cell_state_in->info()->tensor_shape();
 
     // Configure block that calculates the forget gate
     // forget_gate = Activation(input * input_to_forget_weights + output_state_in * recurrent_to_forget_weights + PixelWiseMul(cell_state, cell_to_forget_weights) + forget_gate_bias)
@@ -495,6 +495,7 @@
 
     _memory_group.acquire();
 
+    _concat_inputs_forget_gate.run();
     _fully_connected_forget_gate.run();
 
     if(_run_peephole_opt)
@@ -574,7 +575,6 @@
 {
     if(!_is_prepared)
     {
-        _concat_inputs_forget_gate.run();
         _concat_weights_forget_gate.run();
         if(!_run_cifg_opt)
         {