David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 1 | // |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 2 | // Copyright © 2017, 2019-2023 Arm Ltd and Contributors. All rights reserved. |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 3 | // SPDX-License-Identifier: MIT |
| 4 | // |
| 5 | |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 6 | |
Sadik Armagan | a097d2a | 2021-11-24 15:47:28 +0000 | [diff] [blame] | 7 | #include <CommonTestUtils.hpp> |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 8 | |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 9 | #include <Graph.hpp> |
| 10 | #include <Network.hpp> |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 11 | #include <SubgraphViewSelector.hpp> |
| 12 | |
Francis Murtagh | a49ff08 | 2022-01-17 17:08:01 +0000 | [diff] [blame] | 13 | #include <armnn/backends/OptimizationViews.hpp> |
| 14 | #include <armnn/backends/SubgraphView.hpp> |
| 15 | #include <armnn/utility/PolymorphicDowncast.hpp> |
Cathal Corbett | 3464ba1 | 2022-03-04 11:36:39 +0000 | [diff] [blame] | 16 | #include <armnnTestUtils/MockBackend.hpp> |
Francis Murtagh | a49ff08 | 2022-01-17 17:08:01 +0000 | [diff] [blame] | 17 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 18 | #include <doctest/doctest.h> |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 19 | |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 20 | using namespace armnn; |
| 21 | |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 22 | void CheckLayers(Graph& graph) |
| 23 | { |
| 24 | unsigned int m_inputLayerCount = 0, m_outputLayerCount = 0, m_addLayerCount = 0; |
| 25 | for(auto layer : graph) |
| 26 | { |
| 27 | switch(layer->GetType()) |
| 28 | { |
| 29 | case LayerType::Input: |
| 30 | ++m_inputLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 31 | CHECK((layer->GetName() == std::string("inLayer0") || |
Narumol Prangnawarat | 60a20fb | 2019-12-09 17:24:41 +0000 | [diff] [blame] | 32 | layer->GetName() == std::string("inLayer1"))); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 33 | break; |
| 34 | // The Addition layer should become a PreCompiled Layer after Optimisation |
| 35 | case LayerType::PreCompiled: |
| 36 | ++m_addLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 37 | CHECK(std::string(layer->GetName()) == "pre-compiled"); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 38 | break; |
| 39 | case LayerType::Output: |
| 40 | ++m_outputLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 41 | CHECK(std::string(layer->GetName()) == "outLayer"); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 42 | break; |
| 43 | default: |
| 44 | //Fail for anything else |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 45 | CHECK(false); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 46 | } |
| 47 | } |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 48 | CHECK(m_inputLayerCount == 2); |
| 49 | CHECK(m_outputLayerCount == 1); |
| 50 | CHECK(m_addLayerCount == 1); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 51 | } |
| 52 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 53 | TEST_SUITE("OptimizationViewsTestSuite") |
| 54 | { |
| 55 | TEST_CASE("OptimizedViewsSubgraphLayerCount") |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 56 | { |
| 57 | OptimizationViews view; |
| 58 | // Construct a graph with 3 layers |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 59 | Graph baseGraph; |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 60 | |
| 61 | Layer* const inputLayer = baseGraph.AddLayer<InputLayer>(0, "input"); |
| 62 | |
| 63 | Convolution2dDescriptor convDescriptor; |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 64 | PreCompiledDescriptor substitutionLayerDescriptor(2, 1); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 65 | Layer* const convLayer1 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv1"); |
| 66 | Layer* const convLayer2 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv2"); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 67 | Layer* const weightsLayer1 = baseGraph.AddLayer<ConstantLayer>("weights1"); |
| 68 | Layer* const weightsLayer2 = baseGraph.AddLayer<ConstantLayer>("weights2"); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 69 | Layer* const substitutableCompiledLayer = |
| 70 | baseGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 71 | |
| 72 | Layer* const outputLayer = baseGraph.AddLayer<OutputLayer>(0, "output"); |
| 73 | |
| 74 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 75 | weightsLayer1->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(1)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 76 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 77 | weightsLayer2->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(1)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 78 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 79 | |
| 80 | // Subgraph for a failed layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 81 | SubgraphView::SubgraphViewPtr failedSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 82 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 83 | CreateOutputsFrom({convLayer1}), |
| 84 | {convLayer1}); |
| 85 | // Subgraph for an untouched layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 86 | SubgraphView::SubgraphViewPtr untouchedSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 87 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 88 | CreateOutputsFrom({convLayer2}), |
| 89 | {convLayer2}); |
| 90 | // Subgraph for a substitutable layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 91 | SubgraphView::SubgraphViewPtr substitutableSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 92 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 93 | CreateOutputsFrom({convLayer2}), |
| 94 | {substitutableCompiledLayer}); |
| 95 | // Create a Graph containing a layer to substitute in |
| 96 | Graph substitutableGraph; |
| 97 | Layer* const substitutionpreCompiledLayer = |
| 98 | substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 99 | |
| 100 | // Subgraph for a substitution layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 101 | SubgraphView::SubgraphViewPtr substitutionSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 102 | CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 103 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 104 | {substitutionpreCompiledLayer}); |
| 105 | |
| 106 | // Sub in the graph |
| 107 | baseGraph.SubstituteSubgraph(*substitutableSubgraph, *substitutionSubgraph); |
| 108 | |
| 109 | view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); |
| 110 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 111 | |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 112 | SubgraphView::SubgraphViewPtr baseSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 113 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 114 | CreateOutputsFrom({convLayer2}), |
| 115 | {substitutionpreCompiledLayer}); |
| 116 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 117 | |
| 118 | // Construct original subgraph to compare against |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 119 | SubgraphView::SubgraphViewPtr originalSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 120 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 121 | CreateOutputsFrom({convLayer2}), |
| 122 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 123 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 124 | CHECK(view.Validate(*originalSubgraph)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 125 | } |
| 126 | |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 127 | |
| 128 | TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") |
| 129 | { |
| 130 | OptimizationViews view; |
| 131 | |
| 132 | IConnectableLayer* const inputLayer = view.GetINetwork()->AddInputLayer(0, "input"); |
| 133 | |
| 134 | DepthwiseConvolution2dDescriptor convDescriptor; |
Cathal Corbett | 0690265 | 2022-04-14 17:55:11 +0100 | [diff] [blame] | 135 | PreCompiledDescriptor substitutionLayerDescriptor(2, 1); |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 136 | CompiledBlobPtr blobPtr; |
| 137 | BackendId backend = Compute::CpuRef; |
| 138 | |
| 139 | Layer* convLayer1 = PolymorphicDowncast<Layer*>( |
| 140 | view.GetINetwork()->AddDepthwiseConvolution2dLayer(convDescriptor, |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 141 | "conv1")); |
| 142 | |
| 143 | Layer* convLayer2 = PolymorphicDowncast<Layer*>( |
| 144 | view.GetINetwork()->AddDepthwiseConvolution2dLayer(convDescriptor, |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 145 | "conv2")); |
| 146 | |
| 147 | IConnectableLayer* const outputLayer = view.GetINetwork()->AddOutputLayer(0, "output"); |
| 148 | |
| 149 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
| 150 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
| 151 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 152 | |
| 153 | // Subgraph for a failed layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 154 | SubgraphView::SubgraphViewPtr failedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 155 | CreateOutputsFrom({convLayer1}), |
| 156 | {convLayer1}); |
| 157 | // Subgraph for an untouched layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 158 | SubgraphView::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 159 | CreateOutputsFrom({convLayer2}), |
| 160 | {convLayer2}); |
| 161 | |
| 162 | // Create a Network containing a layer to substitute in |
| 163 | NetworkImpl net; |
| 164 | Layer* substitutionpreCompiledLayer = PolymorphicDowncast<Layer*>( |
Cathal Corbett | 3ea0107 | 2022-01-06 10:29:43 +0000 | [diff] [blame] | 165 | net.AddPrecompiledLayer(substitutionLayerDescriptor, std::move(blobPtr), backend)); |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 166 | |
| 167 | // Subgraph for a substitution layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 168 | SubgraphView::SubgraphViewPtr substitutionSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 169 | CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 170 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 171 | {substitutionpreCompiledLayer}); |
| 172 | |
| 173 | view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); |
| 174 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 175 | |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 176 | SubgraphView::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 177 | CreateOutputsFrom({convLayer2}), |
| 178 | {substitutionpreCompiledLayer}); |
| 179 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 180 | |
| 181 | // Construct original subgraph to compare against |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 182 | SubgraphView::SubgraphViewPtr originalSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 183 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 184 | CreateOutputsFrom({convLayer2}), |
| 185 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 186 | |
| 187 | CHECK(view.Validate(*originalSubgraph)); |
| 188 | } |
| 189 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 190 | TEST_CASE("OptimizedViewsSubgraphLayerCountFailValidate") |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 191 | { |
| 192 | OptimizationViews view; |
| 193 | // Construct a graph with 3 layers |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 194 | Graph baseGraph; |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 195 | |
| 196 | Layer* const inputLayer = baseGraph.AddLayer<InputLayer>(0, "input"); |
| 197 | |
| 198 | Convolution2dDescriptor convDescriptor; |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 199 | PreCompiledDescriptor substitutionLayerDescriptor(2, 1); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 200 | Layer* const convLayer1 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv1"); |
| 201 | Layer* const convLayer2 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv2"); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 202 | Layer* const weightsLayer1 = baseGraph.AddLayer<ConstantLayer>("weights1"); |
| 203 | Layer* const weightsLayer2 = baseGraph.AddLayer<ConstantLayer>("weights2"); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 204 | Layer* const substitutableCompiledLayer = |
| 205 | baseGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 206 | |
| 207 | Layer* const outputLayer = baseGraph.AddLayer<OutputLayer>(0, "output"); |
| 208 | |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 209 | |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 210 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 211 | weightsLayer1->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(1)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 212 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 213 | weightsLayer2->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(1)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 214 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 215 | |
| 216 | // Subgraph for an untouched layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 217 | SubgraphView::SubgraphViewPtr untouchedSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 218 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer2), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 219 | CreateOutputsFrom({convLayer2}), |
| 220 | {convLayer2}); |
| 221 | // Subgraph for a substitutable layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 222 | SubgraphView::SubgraphViewPtr substitutableSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 223 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 224 | CreateOutputsFrom({convLayer2}), |
| 225 | {substitutableCompiledLayer}); |
| 226 | // Create a Graph containing a layer to substitute in |
| 227 | Graph substitutableGraph; |
| 228 | Layer* const substitutionpreCompiledLayer = |
| 229 | substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 230 | |
| 231 | // Subgraph for a substitution layer |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 232 | SubgraphView::SubgraphViewPtr substitutionSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 233 | CreateSubgraphViewFrom(CreateInputsFrom(substitutionpreCompiledLayer), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 234 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 235 | {substitutionpreCompiledLayer}); |
| 236 | |
| 237 | // Sub in the graph |
| 238 | baseGraph.SubstituteSubgraph(*substitutableSubgraph, *substitutionSubgraph); |
| 239 | |
| 240 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 241 | |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 242 | SubgraphView::SubgraphViewPtr baseSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 243 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 244 | CreateOutputsFrom({convLayer2}), |
| 245 | {substitutionpreCompiledLayer}); |
| 246 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 247 | |
| 248 | // Construct original subgraph to compare against |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 249 | SubgraphView::SubgraphViewPtr originalSubgraph = |
Keith Davis | b4dd5cc | 2022-04-07 11:32:00 +0100 | [diff] [blame] | 250 | CreateSubgraphViewFrom(CreateInputsFrom(convLayer1), |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 251 | CreateOutputsFrom({convLayer2}), |
| 252 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 253 | |
| 254 | // Validate should fail as convLayer1 is not counted |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 255 | CHECK(!view.Validate(*originalSubgraph)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 256 | } |
| 257 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 258 | TEST_CASE("OptimizeViewsValidateDeviceMockBackend") |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 259 | { |
| 260 | // build up the structure of the network |
| 261 | armnn::INetworkPtr net(armnn::INetwork::Create()); |
| 262 | |
| 263 | armnn::IConnectableLayer* input = net->AddInputLayer(0, "inLayer0"); |
| 264 | armnn::IConnectableLayer* input1 = net->AddInputLayer(1, "inLayer1"); |
| 265 | |
Mike Kelly | 52e90bf | 2023-03-15 15:06:23 +0000 | [diff] [blame] | 266 | ARMNN_NO_DEPRECATE_WARN_BEGIN |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 267 | armnn::IConnectableLayer* addition = net->AddAdditionLayer("addLayer"); |
Mike Kelly | 52e90bf | 2023-03-15 15:06:23 +0000 | [diff] [blame] | 268 | ARMNN_NO_DEPRECATE_WARN_END |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 269 | |
| 270 | armnn::IConnectableLayer* output = net->AddOutputLayer(0, "outLayer"); |
| 271 | |
| 272 | input->GetOutputSlot(0).Connect(addition->GetInputSlot(0)); |
| 273 | input1->GetOutputSlot(0).Connect(addition->GetInputSlot(1)); |
| 274 | addition->GetOutputSlot(0).Connect(output->GetInputSlot(0)); |
| 275 | |
| 276 | input->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 277 | input1->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 278 | addition->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 279 | |
David Monahan | c1536d6 | 2020-02-12 15:52:35 +0000 | [diff] [blame] | 280 | armnn::MockBackendInitialiser initialiser; |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 281 | armnn::IRuntime::CreationOptions options; |
| 282 | armnn::IRuntimePtr runtime(armnn::IRuntime::Create(options)); |
| 283 | |
| 284 | std::vector<armnn::BackendId> backends = { MockBackend().GetIdStatic() }; |
| 285 | armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 286 | CHECK(optNet); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 287 | |
| 288 | // Check the optimised graph |
Francis Murtagh | 3d2b4b2 | 2021-02-15 18:23:17 +0000 | [diff] [blame] | 289 | armnn::Graph& graph = GetGraphForTesting(optNet.get()); |
| 290 | CheckLayers(graph); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 291 | } |
| 292 | |
Francis Murtagh | 5b2145c | 2022-12-19 13:36:36 +0000 | [diff] [blame] | 293 | TEST_CASE("OptimizedViewsReturnsINetworkReference") |
| 294 | { |
| 295 | OptimizationViews view; |
| 296 | |
| 297 | auto layer = view.GetINetworkRef().AddInputLayer(0, "input"); |
| 298 | |
| 299 | // Check layer has been added to the referenced INetwork |
| 300 | CHECK(layer); |
| 301 | } |
| 302 | |
| 303 | |
Francis Murtagh | 01f7269 | 2022-12-21 09:10:04 +0000 | [diff] [blame] | 304 | } |