From 01f72693d39ed966ad06adadc8aac141bc395659 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Wed, 21 Dec 2022 09:10:04 +0000 Subject: IVGCVSW-7418 Allow working copy SubgraphView to get Original Slots * API to remove need for workaround so backend users can get slots * OutputSlots outside the SubgraphView needed to obtain TensorInfo * Fix a few Copyright headers * Add shared_ptr back to original subgraph view using std::enable_shared_from_this Signed-off-by: Francis Murtagh Change-Id: I033a00d6fc4020619d406ac06a156b7e380a426a --- .../backendsCommon/test/OptimizeSubgraphViewTests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp') diff --git a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp index 997fe9850d..f5a6c4217b 100644 --- a/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp +++ b/src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017, 2022-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -935,7 +935,7 @@ void FullyOptimizableSubgraphTestImpl1() LayerNameToLayerMap layersInGraph; // Create a fully optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildFullyOptimizableSubgraph1(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildFullyOptimizableSubgraph1(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); @@ -1002,7 +1002,7 @@ void FullyOptimizableSubgraphTestImpl2() LayerNameToLayerMap layersInGraph; // Create a fully optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildFullyOptimizableSubgraph2(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildFullyOptimizableSubgraph2(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); @@ -1110,7 +1110,7 @@ void PartiallySupportedSubgraphTestImpl() LayerNameToLayerMap layersInGraph; // Create a fully optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildPartiallySupportedSubgraph(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildPartiallySupportedSubgraph(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); @@ -1254,7 +1254,7 @@ void FullyUnoptimizableSubgraphTestImpl1() LayerNameToLayerMap layersInGraph; // Create a fully optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildFullyUnoptimizableSubgraph1(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildFullyUnoptimizableSubgraph1(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); @@ -1318,7 +1318,7 @@ void PartiallyOptimizableSubgraphTestImpl1() LayerNameToLayerMap layersInGraph; // Create a fully optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildPartiallyOptimizableSubgraph1(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildPartiallyOptimizableSubgraph1(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); @@ -1470,7 +1470,7 @@ void PartiallyOptimizableSubgraphTestImpl2() LayerNameToLayerMap layersInGraph; // Create a partially optimizable subgraph - SubgraphViewSelector::SubgraphViewPtr subgraphPtr = BuildPartiallyOptimizableSubgraph2(graph, layersInGraph); + SubgraphView::SubgraphViewPtr subgraphPtr = BuildPartiallyOptimizableSubgraph2(graph, layersInGraph); CHECK((subgraphPtr != nullptr)); const SubgraphView::IInputSlots& subgraphInputSlots = subgraphPtr->GetIInputSlots(); -- cgit v1.2.1