diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2022-12-19 13:36:36 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2023-01-09 10:34:32 +0000 |
| commit | 5b2145c92dabb68a0ec7ff65948f52d3fdcecf4a (patch) | |
| tree | e9faf383d3bc685d19c88d72b35ae48bb9b8412b | |
| parent | b5540547d615b7fb642018f426eaedfd70e85c6c (diff) | |
| download | armnn-5b2145c92dabb68a0ec7ff65948f52d3fdcecf4a.tar.gz | |
IVGCVSW-6632 Return INetwork* not INetworkPtr& from OptimizationViews::GetINetwork()
* Also provide API to return reference via GetINetworkRef().
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I80f4912cb7e22a2023e9bb880182ad4610c219e9
| -rw-r--r-- | include/armnn/backends/OptimizationViews.hpp | 5 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/OptimizationViewsTests.cpp | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp index 0357adaa27..59d71ca560 100644 --- a/include/armnn/backends/OptimizationViews.hpp +++ b/include/armnn/backends/OptimizationViews.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2019, 2021-2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -64,7 +64,8 @@ public: ARMNN_DEPRECATED_MSG_REMOVAL_DATE("GetGraph is deprecated. Use GetINetwork instead.", "23.08") Graph& GetGraph() { return m_Graph; } - INetworkPtr& GetINetwork() { return m_INetwork; } + INetwork* GetINetwork() { return m_INetwork.get(); } + INetwork& GetINetworkRef() { return *m_INetwork; } private: Substitutions m_SuccesfulOptimizations; ///< Proposed substitutions from successful optimizations diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index 9b86784dce..ff84eea2de 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2019-2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -288,4 +288,15 @@ TEST_CASE("OptimizeViewsValidateDeviceMockBackend") CheckLayers(graph); } +TEST_CASE("OptimizedViewsReturnsINetworkReference") +{ + OptimizationViews view; + + auto layer = view.GetINetworkRef().AddInputLayer(0, "input"); + + // Check layer has been added to the referenced INetwork + CHECK(layer); +} + + }
\ No newline at end of file |