From 2b481f81b610b8d1438960e3d78dfb247152859b Mon Sep 17 00:00:00 2001 From: David Monahan Date: Tue, 8 Feb 2022 19:09:56 +0000 Subject: IVGCVSW-6700 Fix segfault * Update how we are setting the m_InputWorkloadSlotPairs to properly identify inputs Signed-off-by: David Monahan Change-Id: I6d36f6d2bfdd42ade22c34e215f0d18b02702207 --- src/armnn/LoadedNetwork.cpp | 6 ++++-- src/backends/reference/RefTensorHandle.cpp | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 48a3040b23..fd7279a294 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -317,9 +317,11 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr net, unsigned int inputSlotIndex = 0; for (auto& inputSlot : layer->GetInputSlots()) { - if (inputSlot.GetOwningLayer().GetType() == LayerType::Input) + if (inputSlot.GetConnectedOutputSlot()->GetOwningLayer().GetType() == LayerType::Input) { - auto inputLayer = PolymorphicDowncast(&inputSlot.GetOwningLayer()); + auto inputLayer = + PolymorphicDowncast( + &inputSlot.GetConnectedOutputSlot()->GetOwningLayer()); m_InputWorkloadSlotPairs[inputLayer->GetBindingId()] = std::make_pair(m_WorkloadQueue.size(), inputSlotIndex); } diff --git a/src/backends/reference/RefTensorHandle.cpp b/src/backends/reference/RefTensorHandle.cpp index a8d6a66ebb..e196b61ccd 100644 --- a/src/backends/reference/RefTensorHandle.cpp +++ b/src/backends/reference/RefTensorHandle.cpp @@ -129,7 +129,6 @@ bool RefTensorHandle::Import(void* memory, MemorySource source) m_Imported = false; m_UnmanagedMemory = nullptr; } - return false; } -- cgit v1.2.1