diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-07-07 15:43:06 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2023-07-14 00:00:53 +0100 |
| commit | 4cc341cf8b5a6e6bb0543504cbbfde6fa11a2cdb (patch) | |
| tree | 7cac128e9ec6f2fd27f1afdb55f44b870f39e0b3 /include/armnn/backends | |
| parent | 6963b33221c23af4a8eff19ff4a5773230b0befd (diff) | |
| download | armnn-4cc341cf8b5a6e6bb0543504cbbfde6fa11a2cdb.tar.gz | |
IVGCVSW-7830 Add backend optimizations to remove Reshapes where possible
* Added optimization to remove reshapes for Neon and Ref Backends
by using overridden TensorInfos
* Added ability to delete Subgraphs during Optimization
* Fixed naming error in NeonEndToEndTests and CLEndToEndTests
* Added LayerNameAndTypeCheck for testing.
* Fixed error where layers were not marked as altered when removed in
CLBackend
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I1ac25cd4ec9821470d961831ae2c8d24882276cc
Diffstat (limited to 'include/armnn/backends')
| -rw-r--r-- | include/armnn/backends/ITensorHandle.hpp | 11 | ||||
| -rw-r--r-- | include/armnn/backends/OptimizationViews.hpp | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/armnn/backends/ITensorHandle.hpp b/include/armnn/backends/ITensorHandle.hpp index 78404d0e39..5d8f36ff12 100644 --- a/include/armnn/backends/ITensorHandle.hpp +++ b/include/armnn/backends/ITensorHandle.hpp @@ -1,11 +1,12 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #pragma once #include <armnn/MemorySources.hpp> #include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/Tensor.hpp> namespace armnn { @@ -91,6 +92,14 @@ public: /// Unimport externally allocated memory virtual void Unimport() {}; + + /// Returns a decorated version of this TensorHandle allowing us to override the TensorInfo for it + /// \param tensorInfo the overidden TensorInfo. + virtual std::shared_ptr<ITensorHandle> DecorateTensorHandle(const TensorInfo& tensorInfo) + { + IgnoreUnused(tensorInfo); + return nullptr; + } }; } diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp index 6f27345ca4..ec1dc55156 100644 --- a/include/armnn/backends/OptimizationViews.hpp +++ b/include/armnn/backends/OptimizationViews.hpp @@ -50,9 +50,15 @@ public: m_UntouchedSubgraphs.emplace_back(subgraph); } + void AddDeletedSubgraph(SubgraphView&& subgraph) + { + m_DeletedSubgraphs.emplace_back(subgraph); + } + const Substitutions& GetSubstitutions() const { return m_SuccesfulOptimizations; } const Subgraphs& GetFailedSubgraphs() const { return m_FailedOptimizations; } const Subgraphs& GetUntouchedSubgraphs() const { return m_UntouchedSubgraphs; } + const Subgraphs& GetDeletedSubgraphs() const { return m_DeletedSubgraphs; } Substitutions& GetSubstitutions() { return m_SuccesfulOptimizations; } Subgraphs& GetFailedSubgraphs() { return m_FailedOptimizations; } @@ -67,6 +73,7 @@ private: Substitutions m_SuccesfulOptimizations; ///< Proposed substitutions from successful optimizations Subgraphs m_FailedOptimizations; ///< Subgraphs from the original subgraph which cannot be supported Subgraphs m_UntouchedSubgraphs; ///< Subgraphs from the original subgraph which remain unmodified + Subgraphs m_DeletedSubgraphs; ///< Subgraphs from the original subgraph which have been deleted /// INetworkPtr object used only as a container for any layer generated by the optimization process /// Also, can use to AddPrecompiledLayer to the SubstitutionPair |