From d86f6c4697e0c1511c553e76e0e59b72a5730fac Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 9 May 2022 17:00:21 +0100 Subject: 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 Change-Id: I7cff50798d7217e8ea0d2f9b153eabd10174a566 --- src/armnn/LoadedNetwork.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/armnn/LoadedNetwork.cpp') diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 228927db57..ec79d5da3e 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -143,7 +143,10 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr net, bool useExternalMemoryManager = false; bool useInternalMemoryManager = false; - Graph& order = m_OptimizedNetwork->pOptimizedNetworkImpl->GetGraph().TopologicalSort(); + Graph& order = m_OptimizedNetwork->pOptimizedNetworkImpl->GetGraph(); + // Ensure Topological order + order.SetLayersOutOfOrder(); + order.TopologicalSort(); if (!networkProperties.m_AsyncEnabled) { -- cgit v1.2.1