From 1b2654fb799c3d25ffcef4d31b5d026d359e2f8f Mon Sep 17 00:00:00 2001
From: Jan Eilers <jan.eilers@arm.com>
Date: Fri, 24 Sep 2021 15:45:46 +0100
Subject: 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
---
 src/armnn/test/TestLayerVisitor.hpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/armnn/test/TestLayerVisitor.hpp')

diff --git a/src/armnn/test/TestLayerVisitor.hpp b/src/armnn/test/TestLayerVisitor.hpp
index e43227f520..eaf1667800 100644
--- a/src/armnn/test/TestLayerVisitor.hpp
+++ b/src/armnn/test/TestLayerVisitor.hpp
@@ -4,13 +4,14 @@
 //
 #pragma once
 
-#include <armnn/LayerVisitorBase.hpp>
+#include <armnn/StrategyBase.hpp>
 #include <armnn/Descriptors.hpp>
+#include <backendsCommon/TensorHandle.hpp>
 
 namespace armnn
 {
-// Abstract base class with do nothing implementations for all layer visit methods
-class TestLayerVisitor : public LayerVisitorBase<VisitorNoThrowPolicy>
+// Abstract base class with do nothing implementations for all layers
+class TestLayerVisitor : public StrategyBase<NoThrowStrategy>
 {
 protected:
     virtual ~TestLayerVisitor() {}
@@ -19,7 +20,17 @@ protected:
 
     void CheckLayerPointer(const IConnectableLayer* layer);
 
-    void CheckConstTensors(const ConstTensor& expected, const ConstTensor& actual);
+    void CheckConstTensors(const ConstTensor& expected,
+                           const ConstTensor& actual);
+    void CheckConstTensors(const ConstTensor& expected,
+                           const ConstTensorHandle& actual);
+
+    void CheckConstTensorPtrs(const std::string& name,
+                              const ConstTensor* expected,
+                              const ConstTensor* actual);
+    void CheckConstTensorPtrs(const std::string& name,
+                              const ConstTensor* expected,
+                              const std::shared_ptr<ConstTensorHandle> actual);
 
     void CheckOptionalConstTensors(const Optional<ConstTensor>& expected, const Optional<ConstTensor>& actual);
 
-- 
cgit v1.2.1