IVGCVSW-5985 Remove deprecated code

 * Removes deprecated AddLayer, IsLayerSupported functions
 * Marks the whole LayerVisitor class as deprecated not just the
   constructor. This required to wrap all Accept functions in a
   no deprecate macro because the LayerVisitor is used as a parameter in
   there
 * Removes usage of deprecated LayerVisitor and replaces it
   with ExecuteStrategy. This required a few structural changes
   in the unit tests
 * Adds a default implementation for IStrategy called StrategyBase
 * Changes pyarmnn to use non deprecated constructor for
   INetworkProperties and adds related unit test
 * Marks usage of deprecated code in pyarmnn as deprecated. This
   required to extend INetworkProperties to allow backwards compatibility
 * Removes deprecated functions from CpuAcc, GpuAcc and Ref backends

Note: This patch breaks compatibility with backends that are not
      updated in this patch

!android-nn-driver:6325

Signed-off-by: Jan Eilers <jan.eilers@arm.com>
Change-Id: Id13b6f37a74d26eadeda2da1dc92915e725ed5a5

1 files changed, 2 insertions, 39 deletions

diff --git a/src/backends/backendsCommon/IBackendInternal.cpp b/src/backends/backendsCommon/IBackendInternal.cpp
index 31706eb1e7..ec1313df0c 100644
--- a/src/backends/backendsCommon/IBackendInternal.cpp
+++ b/src/backends/backendsCommon/IBackendInternal.cpp
@@ -9,26 +9,6 @@
 namespace armnn
 {
 
-ARMNN_NO_DEPRECATE_WARN_BEGIN
-IBackendInternal::ISubGraphConverterPtr IBackendInternal::CreateSubGraphConverter(
-    const std::shared_ptr<SubGraph>& /*subGrapg*/) const
-{
-    return ISubGraphConverterPtr{};
-}
-
-IBackendInternal::Optimizations IBackendInternal::GetOptimizations() const
-{
-    return Optimizations{};
-}
-
-IBackendInternal::SubGraphUniquePtr IBackendInternal::OptimizeSubGraph(const SubGraph& /*subGraph*/,
-                                                                       bool& optimizationAttempted) const
-{
-    optimizationAttempted = false;
-    return nullptr;
-}
-ARMNN_NO_DEPRECATE_WARN_END
-
 IMemoryManagerUniquePtr IBackendInternal::CreateMemoryManager() const
 {
     return IMemoryManagerUniquePtr();
@@ -120,29 +100,12 @@ IBackendInternal::ILayerSupportSharedPtr IBackendInternal::GetLayerSupport(const
     return GetLayerSupport();
 }
 
-// Default implementation of OptimizeSubgraphView for backward compatibility with the old API.
+// Default implementation of OptimizeSubgraphView. Returns an untouched subgraph.
 // Override this method with a custom optimization implementation.
 OptimizationViews IBackendInternal::OptimizeSubgraphView(const SubgraphView& subgraph) const
 {
-    bool optimizationAttempted = false;
-
-    ARMNN_NO_DEPRECATE_WARN_BEGIN
-    SubGraphUniquePtr optSubgraph = OptimizeSubGraph(subgraph, optimizationAttempted);
-    ARMNN_NO_DEPRECATE_WARN_END
-
     OptimizationViews result;
-    if (!optimizationAttempted)
-    {
-        result.AddUntouchedSubgraph(SubgraphView(subgraph));
-    }
-    else if (optSubgraph)
-    {
-        result.AddSubstitution({subgraph, SubgraphView(*optSubgraph.get())});
-    }
-    else
-    {
-        result.AddFailedSubgraph(SubgraphView(subgraph));
-    }
+    result.AddUntouchedSubgraph(SubgraphView(subgraph));
 
     return result;
 }