diff options
| author | David Monahan <David.Monahan@arm.com> | 2022-02-08 19:09:56 +0000 |
|---|---|---|
| committer | David Monahan <David.Monahan@arm.com> | 2022-02-08 19:29:24 +0000 |
| commit | 2b481f81b610b8d1438960e3d78dfb247152859b (patch) | |
| tree | 18a15a98da6bb937c0454c37e60732d0e772ebcd | |
| parent | 67d6390c3b37c83bad2180ee4dc54893143c7b29 (diff) | |
| download | armnn-2b481f81b610b8d1438960e3d78dfb247152859b.tar.gz | |
IVGCVSW-6700 Fix segfault
* Update how we are setting the m_InputWorkloadSlotPairs to properly identify inputs
Signed-off-by: David Monahan <David.Monahan@arm.com>
Change-Id: I6d36f6d2bfdd42ade22c34e215f0d18b02702207
| -rw-r--r-- | src/armnn/LoadedNetwork.cpp | 6 | ||||
| -rw-r--r-- | 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<IOptimizedNetwork> 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<InputLayer*>(&inputSlot.GetOwningLayer()); + auto inputLayer = + PolymorphicDowncast<InputLayer*>( + &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; } |