From c3ba50e5e6e96ae057ccdb3761bf41a5691a53f0 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Wed, 22 May 2019 14:28:16 +0100 Subject: IVGCVSW-3132 Reintroduce SubGraph definition, but deprecated * Restored old SubGraph class definition as an alias of SubgraphView for backward compatibility * Restored SubGraphUniquePtr * Restored CreateSubGraphConverter method (and the corresponding ISubGraphConverterPtr type) as a deprecated method that's been removed from the backend interface * Chaged the defautl implementation of OptimizeSubgraphView to call the deprecated OptimizeSubGraph * Changed the default implementation of OptimizeSubgraphView in the backends Change-Id: If69903926bf5ff2aae52c9b64b4572b355662757 Signed-off-by: Matteo Martincigh --- src/backends/cl/ClBackend.cpp | 10 +++++----- src/backends/cl/ClBackend.hpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/backends/cl') diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp index 5d87d27381..332ae1e679 100644 --- a/src/backends/cl/ClBackend.cpp +++ b/src/backends/cl/ClBackend.cpp @@ -74,13 +74,13 @@ IBackendInternal::ILayerSupportSharedPtr ClBackend::GetLayerSupport() const return layerSupport; } -IBackendInternal::SubgraphViewUniquePtr ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph, - bool& optimizationAttempted) const +OptimizationViews ClBackend::OptimizeSubgraphView(const SubgraphView& subgraph) const { - // Not trying to optimize the given sub-graph - optimizationAttempted = false; + OptimizationViews optimizationViews; - return SubgraphViewUniquePtr{}; + optimizationViews.AddUntouchedSubgraph(SubgraphView(subgraph)); + + return optimizationViews; } } // namespace armnn diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index 171c7d5737..12e8d8ef5a 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -28,8 +28,7 @@ public: IBackendInternal::Optimizations GetOptimizations() const override; IBackendInternal::ILayerSupportSharedPtr GetLayerSupport() const override; - IBackendInternal::SubgraphViewUniquePtr OptimizeSubgraphView(const SubgraphView& subgraph, - bool& optimizationAttempted) const override; + OptimizationViews OptimizeSubgraphView(const SubgraphView& subgraph) const override; }; } // namespace armnn -- cgit v1.2.1