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.cpp | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

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

diff --git a/src/armnn/test/TestLayerVisitor.cpp b/src/armnn/test/TestLayerVisitor.cpp
index ec405119d1..d5f705f0da 100644
--- a/src/armnn/test/TestLayerVisitor.cpp
+++ b/src/armnn/test/TestLayerVisitor.cpp
@@ -49,6 +49,62 @@ void TestLayerVisitor::CheckConstTensors(const ConstTensor& expected, const Cons
     }
 }
 
+void TestLayerVisitor::CheckConstTensors(const ConstTensor& expected, const ConstTensorHandle& actual)
+{
+    auto& actualInfo = actual.GetTensorInfo();
+    CHECK(expected.GetInfo() == actualInfo);
+    CHECK(expected.GetNumDimensions() == actualInfo.GetNumDimensions());
+    CHECK(expected.GetNumElements() == actualInfo.GetNumElements());
+    CHECK(expected.GetNumBytes() == actualInfo.GetNumBytes());
+    if (expected.GetNumBytes() == actualInfo.GetNumBytes())
+    {
+        //check data is the same byte by byte
+        const unsigned char* expectedPtr = static_cast<const unsigned char*>(expected.GetMemoryArea());
+        const unsigned char* actualPtr = static_cast<const unsigned char*>(actual.Map(true));
+        for (unsigned int i = 0; i < expected.GetNumBytes(); i++)
+        {
+            CHECK(*(expectedPtr + i) == *(actualPtr + i));
+        }
+        actual.Unmap();
+    }
+}
+
+void TestLayerVisitor::CheckConstTensorPtrs(const std::string& name,
+                                            const ConstTensor* expected,
+                                            const std::shared_ptr<ConstTensorHandle> actual)
+{
+    if (expected == nullptr)
+    {
+        CHECK_MESSAGE(actual == nullptr, name + " actual should have been a nullptr");
+    }
+    else
+    {
+        CHECK_MESSAGE(actual != nullptr, name + " actual should have been set");
+        if (actual != nullptr)
+        {
+            CheckConstTensors(*expected, *actual);
+        }
+    }
+}
+
+void TestLayerVisitor::CheckConstTensorPtrs(const std::string& name,
+                                            const ConstTensor* expected,
+                                            const ConstTensor* actual)
+{
+    if (expected == nullptr)
+    {
+        CHECK_MESSAGE(actual == nullptr, name + " actual should have been a nullptr");
+    }
+    else
+    {
+        CHECK_MESSAGE(actual != nullptr, name + " actual should have been set");
+        if (actual != nullptr)
+        {
+            CheckConstTensors(*expected, *actual);
+        }
+    }
+}
+
 void TestLayerVisitor::CheckOptionalConstTensors(const Optional<ConstTensor>& expected,
                                                  const Optional<ConstTensor>& actual)
 {
-- 
cgit v1.2.1