From e814821dbd1ad0a20099294e39e1460c5e4ba7a0 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Fri, 20 Jan 2023 13:38:54 +0000 Subject: IVGCVSW-7013 Removing the check for constant layer in FoldPad Signed-off-by: Teresa Charlin Change-Id: Iaa3cff46217117aefdb92f281e9da2b0315f3af9 --- src/armnn/optimizations/FoldPadIntoLayer2d.hpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp index 874749fda9..2f70e6352c 100644 --- a/src/armnn/optimizations/FoldPadIntoLayer2d.hpp +++ b/src/armnn/optimizations/FoldPadIntoLayer2d.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -157,7 +157,7 @@ Layer2dT* FoldPadIntoLayer2dImpl(Graph& graph, InputSlot& connection) // Save original parent output slot of the pad layer OutputSlot& parentSlot = *padLayer.GetInputSlot(0).GetConnectedOutputSlot(); - // Insert new layer2d layer between the pad layer an its parent layer. + // Insert new layer2d layer between the pad layer and its parent layer. const std::string name = std::string("folded-") + padLayer.GetName() + "-into-" + layer2d.GetName(); auto& newLayer2d = *graph.InsertNewLayer(padLayer.GetInputSlot(0), newLayer2dDescriptor, name.c_str()); @@ -168,13 +168,9 @@ Layer2dT* FoldPadIntoLayer2dImpl(Graph& graph, InputSlot& connection) if (layer2d.GetInputSlot(i).GetConnectedOutputSlot() != nullptr) { Layer& tgtLayer = layer2d.GetInputSlot(i).GetConnectedOutputSlot()->GetOwningLayer(); - // Ensure we are definitely connecting the necessary constant layers - if (tgtLayer.GetType() == armnn::LayerType::Constant) - { - // Remove old connection and connect to new layer2d - tgtLayer.GetOutputSlot(0).Disconnect(layer2d.GetInputSlot(i)); - tgtLayer.GetOutputSlot(0).Connect(newLayer2d.GetInputSlot(i)); - } + // Remove old connection and connect to new layer2d + tgtLayer.GetOutputSlot(0).Disconnect(layer2d.GetInputSlot(i)); + tgtLayer.GetOutputSlot(0).Connect(newLayer2d.GetInputSlot(i)); } } -- cgit v1.2.1