IVGCVSW-6145 ConstTensorsAsInput: Optimizer Fix - GetConstantTensorsByRef

 * Add functionality to check for ConstantTensorsAsInputs to GetConstantTensorsByRef
 * Reorder optimizations so RedirectMembersToConstantInputs occurs after
   Conversion of Constants
 * Ensure graph is in topological order after loading in OptimizedNet
 * Fixed test to check release of m_LayerOutputs.

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I7cff50798d7217e8ea0d2f9b153eabd10174a566

1 files changed, 7 insertions, 0 deletions

diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp
index b1ae974cd6..1f006c9d80 100644
--- a/src/armnn/layers/FullyConnectedLayer.cpp
+++ b/src/armnn/layers/FullyConnectedLayer.cpp
@@ -77,6 +77,13 @@ void FullyConnectedLayer::ValidateTensorShapesFromInputs()
 
 Layer::ConstantTensors FullyConnectedLayer::GetConstantTensorsByRef()
 {
+    Layer::ConstantTensors tensors = GetConnectedConstantAsInputTensors();
+
+    if (!tensors.empty())
+    {
+        return tensors;
+    }
+
     // For API stability DO NOT ALTER order and add new members to the end of vector
     return {m_Weight, m_Bias};
 }