From 2e3f4d2330094b4c8afd9872c2cf6765d69e5bdb Mon Sep 17 00:00:00 2001
From: Teresa Charlin <teresa.charlinreyes@arm.com>
Date: Wed, 29 Jul 2020 14:29:20 +0100
Subject: IVGCVSW-4713 Add EndToEnd test for RANK

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ia8f237a2500986e01843defb75787694a20ba24c
---
 src/backends/backendsCommon/test/CMakeLists.txt    |  1 +
 .../backendsCommon/test/EndToEndTestImpl.hpp       |  4 +-
 .../backendsCommon/test/RankEndToEndTestImpl.hpp   | 64 ++++++++++++++++++++++
 src/backends/reference/test/RefEndToEndTests.cpp   | 31 +++++++++++
 4 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp

diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt
index 19e897c2f7..f87a69bc34 100644
--- a/src/backends/backendsCommon/test/CMakeLists.txt
+++ b/src/backends/backendsCommon/test/CMakeLists.txt
@@ -44,6 +44,7 @@ list(APPEND armnnBackendsCommonUnitTests_sources
     QLstmEndToEndTestImpl.hpp
     QuantizedLstmEndToEndTestImpl.cpp
     QuantizedLstmEndToEndTestImpl.hpp
+    RankEndToEndTestImpl.hpp
     ResizeEndToEndTestImpl.hpp
     RuntimeTestImpl.hpp
     SpaceToDepthEndToEndTestImpl.cpp
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
index 0d16bcd7a9..9ce42019f0 100644
--- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
@@ -184,7 +184,9 @@ void EndToEndLayerTestImpl(INetworkPtr network,
         std::vector<TOutput> out = outputStorage.at(it.first);
         for (unsigned int i = 0; i < out.size(); ++i)
         {
-            BOOST_CHECK(Compare<ArmnnOType>(it.second[i], out[i], tolerance) == true);
+            BOOST_CHECK_MESSAGE(Compare<ArmnnOType>(it.second[i], out[i], tolerance) == true,
+                    "Actual output: " << out[i] << ". Expected output:" << it.second[i]);
+
         }
     }
 }
diff --git a/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp
new file mode 100644
index 0000000000..a67bd46982
--- /dev/null
+++ b/src/backends/backendsCommon/test/RankEndToEndTestImpl.hpp
@@ -0,0 +1,64 @@
+//
+// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include "CommonTestUtils.hpp"
+
+#include <armnn/INetwork.hpp>
+#include <armnn/TypesUtils.hpp>
+
+#include <ResolveType.hpp>
+
+namespace
+{
+
+armnn::INetworkPtr CreateRankNetwork(const armnn::TensorInfo& inputTensorInfo,
+                                     const armnn::TensorInfo& outputTensorInfo)
+{
+    armnn::INetworkPtr network(armnn::INetwork::Create());
+
+    armnn::IConnectableLayer* inputLayer  = network->AddInputLayer(0, "Input");
+    armnn::IConnectableLayer* rankLayer   = network->AddRankLayer("Rank");
+    armnn::IConnectableLayer* outputLayer = network->AddOutputLayer(0, "Output");
+
+    Connect(inputLayer, rankLayer, inputTensorInfo, 0, 0);
+    Connect(rankLayer, outputLayer, outputTensorInfo, 0, 0);
+
+    return network;
+}
+
+template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>>
+void RankEndToEnd(const std::vector<armnn::BackendId>& backends)
+{
+    using namespace armnn;
+
+    std::vector<float> floatInputData{
+         1,  2,  3,  4,  5,
+        11, 12, 13, 14, 15,
+        21, 22, 23, 24, 25
+    };
+    std::vector<T> inputData = armnnUtils::QuantizedVector<T>(floatInputData);
+
+    std::vector<int32_t> expectedOutputData{ 4 };
+
+    TensorInfo inputInfo ({ 1, 1, 5, 3 }, ArmnnType);
+    TensorShape outputShape (Dimensionality::Scalar);
+    TensorInfo outputInfo(outputShape, DataType::Signed32);
+
+    armnn::INetworkPtr network = CreateRankNetwork(inputInfo, outputInfo);
+
+    BOOST_TEST_CHECKPOINT("create a network");
+
+    std::map<int, std::vector<T>> inputTensorData   = {{ 0, inputData }};
+    std::map<int, std::vector<int32_t>> expectedOutputTensorData = {{ 0, expectedOutputData }};
+
+    EndToEndLayerTestImpl<ArmnnType, DataType::Signed32>(move(network),
+                                                         inputTensorData,
+                                                         expectedOutputTensorData,
+                                                         backends);
+}
+
+} // anonymous namespace
\ No newline at end of file
diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp
index 88876877bf..027b621c23 100644
--- a/src/backends/reference/test/RefEndToEndTests.cpp
+++ b/src/backends/reference/test/RefEndToEndTests.cpp
@@ -20,6 +20,7 @@
 #include <backendsCommon/test/LogSoftmaxEndToEndTestImpl.hpp>
 #include <backendsCommon/test/PreluEndToEndTestImpl.hpp>
 #include <backendsCommon/test/QLstmEndToEndTestImpl.hpp>
+#include <backendsCommon/test/RankEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ResizeEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SpaceToDepthEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SplitterEndToEndTestImpl.hpp>
@@ -1257,6 +1258,36 @@ BOOST_AUTO_TEST_CASE(RefQLstmEndToEndTest)
     QLstmEndToEnd(defaultBackends);
 }
 
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTest)
+{
+    RankEndToEnd<armnn::DataType::Float32>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTestFloat16)
+{
+    RankEndToEnd<armnn::DataType::Float16>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTestInt32)
+{
+    RankEndToEnd<armnn::DataType::Signed32>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTestQAsymmS8)
+{
+    RankEndToEnd<armnn::DataType::QAsymmS8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTestQSymmS16)
+{
+    RankEndToEnd<armnn::DataType::QSymmS16>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(RefRankEndToEndTestQSymmS8)
+{
+    RankEndToEnd<armnn::DataType::QSymmS8>(defaultBackends);
+}
+
 #if !defined(__ANDROID__)
 // Only run these tests on non Android platforms
 BOOST_AUTO_TEST_CASE(RefImportNonAlignedPointerTest)
-- 
cgit v1.2.1