diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2022-12-21 09:10:04 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2023-01-12 11:11:28 +0000 |
commit | 01f72693d39ed966ad06adadc8aac141bc395659 (patch) | |
tree | d619d2c112bff714d38025b57370aa4095935e36 /src/backends | |
parent | 05b6a3e5946a3f58b6f5b0caface9153a1c2b364 (diff) | |
download | armnn-01f72693d39ed966ad06adadc8aac141bc395659.tar.gz |
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 <francis.murtagh@arm.com>
Change-Id: I033a00d6fc4020619d406ac06a156b7e380a426a
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/backendsCommon/test/OptimizationViewsTests.cpp | 36 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/OptimizeSubgraphViewTests.cpp | 14 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index ff84eea2de..ff3217911a 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017, 2019-2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017, 2019-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -78,17 +78,17 @@ TEST_CASE("OptimizedViewsSubgraphLayerCount") convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); // Subgraph for a failed layer - SubgraphViewSelector::SubgraphViewPtr failedSubgraph = + SubgraphView::SubgraphViewPtr failedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer1}), {convLayer1}); // Subgraph for an untouched layer - SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = + SubgraphView::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), CreateOutputsFrom({convLayer2}), {convLayer2}); // Subgraph for a substitutable layer - SubgraphViewSelector::SubgraphViewPtr substitutableSubgraph = + SubgraphView::SubgraphViewPtr substitutableSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {substitutableCompiledLayer}); @@ -98,7 +98,7 @@ TEST_CASE("OptimizedViewsSubgraphLayerCount") substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); // Subgraph for a substitution layer - SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = + SubgraphView::SubgraphViewPtr substitutionSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), CreateOutputsFrom({substitutionpreCompiledLayer}), {substitutionpreCompiledLayer}); @@ -109,14 +109,14 @@ TEST_CASE("OptimizedViewsSubgraphLayerCount") view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); - SubgraphViewSelector::SubgraphViewPtr baseSubgraph = + SubgraphView::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {substitutionpreCompiledLayer}); view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); // Construct original subgraph to compare against - SubgraphViewSelector::SubgraphViewPtr originalSubgraph = + SubgraphView::SubgraphViewPtr originalSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {convLayer1, convLayer2, substitutionpreCompiledLayer}); @@ -151,11 +151,11 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); // Subgraph for a failed layer - SubgraphViewSelector::SubgraphViewPtr failedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), + SubgraphView::SubgraphViewPtr failedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer1}), {convLayer1}); // Subgraph for an untouched layer - SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), + SubgraphView::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), CreateOutputsFrom({convLayer2}), {convLayer2}); @@ -165,7 +165,7 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") net.AddPrecompiledLayer(substitutionLayerDescriptor, std::move(blobPtr), backend)); // Subgraph for a substitution layer - SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = + SubgraphView::SubgraphViewPtr substitutionSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), CreateOutputsFrom({substitutionpreCompiledLayer}), {substitutionpreCompiledLayer}); @@ -173,13 +173,13 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); - SubgraphViewSelector::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), + SubgraphView::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {substitutionpreCompiledLayer}); view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); // Construct original subgraph to compare against - SubgraphViewSelector::SubgraphViewPtr originalSubgraph = + SubgraphView::SubgraphViewPtr originalSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {convLayer1, convLayer2, substitutionpreCompiledLayer}); @@ -214,12 +214,12 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountFailValidate") convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); // Subgraph for an untouched layer - SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = + SubgraphView::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), CreateOutputsFrom({convLayer2}), {convLayer2}); // Subgraph for a substitutable layer - SubgraphViewSelector::SubgraphViewPtr substitutableSubgraph = + SubgraphView::SubgraphViewPtr substitutableSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {substitutableCompiledLayer}); @@ -229,7 +229,7 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountFailValidate") substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); // Subgraph for a substitution layer - SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = + SubgraphView::SubgraphViewPtr substitutionSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), CreateOutputsFrom({substitutionpreCompiledLayer}), {substitutionpreCompiledLayer}); @@ -239,14 +239,14 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountFailValidate") view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); - SubgraphViewSelector::SubgraphViewPtr baseSubgraph = + SubgraphView::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {substitutionpreCompiledLayer}); view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); // Construct original subgraph to compare against - SubgraphViewSelector::SubgraphViewPtr originalSubgraph = + SubgraphView::SubgraphViewPtr originalSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), CreateOutputsFrom({convLayer2}), {convLayer1, convLayer2, substitutionpreCompiledLayer}); @@ -299,4 +299,4 @@ TEST_CASE("OptimizedViewsReturnsINetworkReference") } -}
\ No newline at end of file +} 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(); |