From 2b4d88e34ac1f965417fd236fd4786f26bae2042 Mon Sep 17 00:00:00 2001
From: kevmay01 <kevin.may@arm.com>
Date: Thu, 24 Jan 2019 14:05:09 +0000
Subject: IVGCVSW-2503 Refactor RefElementwiseWorkload around Equal and Greater

	* Remove Equal and Greater from RefElementwiseWorkload
	* Create RefComparisonWorkload and add Equal and Greater
	* Update ElementwiseFunction for different input/output types
	* Update TfParser to create Equal/Greater with Boolean output
	* Update relevant tests to check for Boolean comparison

Change-Id: I299b7f2121769c960ac0c6139764a5f3c89c9c32
---
 src/armnn/test/TensorHelpers.hpp | 21 ++++++++++++++++++---
 src/armnn/test/UnitTests.hpp     |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/armnn/test')

diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
index 06818d3918..fcaa0772a0 100644
--- a/src/armnn/test/TensorHelpers.hpp
+++ b/src/armnn/test/TensorHelpers.hpp
@@ -67,11 +67,16 @@ bool SelectiveCompare(T a, T b)
     return SelectiveComparer<T, armnn::IsQuantizedType<T>()>::Compare(a, b);
 };
 
-
+template<typename T>
+bool SelectiveCompareBoolean(T a, T b)
+{
+    return (((a == 0) && (b == 0)) || ((a != 0) && (b != 0)));
+};
 
 template <typename T, std::size_t n>
 boost::test_tools::predicate_result CompareTensors(const boost::multi_array<T, n>& a,
-                                                   const boost::multi_array<T, n>& b)
+                                                   const boost::multi_array<T, n>& b,
+                                                   bool compareBoolean = false)
 {
     // Checks they are same shape.
     for (unsigned int i=0; i<n; i++)
@@ -103,7 +108,17 @@ boost::test_tools::predicate_result CompareTensors(const boost::multi_array<T, n
 
     while (true)
     {
-        bool comparison = SelectiveCompare(a(indices), b(indices));
+        bool comparison;
+        // As true for uint8_t is non-zero (1-255) we must have a dedicated compare for Booleans.
+        if(compareBoolean)
+        {
+            comparison = SelectiveCompareBoolean(a(indices), b(indices));
+        }
+        else
+        {
+            comparison = SelectiveCompare(a(indices), b(indices));
+        }
+
         if (!comparison)
         {
             ++numFailedElements;
diff --git a/src/armnn/test/UnitTests.hpp b/src/armnn/test/UnitTests.hpp
index f489ca030c..04e91ad85e 100644
--- a/src/armnn/test/UnitTests.hpp
+++ b/src/armnn/test/UnitTests.hpp
@@ -41,7 +41,7 @@ void CompareTestResultIfSupported(const std::string& testName, const LayerTestRe
         "The test name does not match the supportedness it is reporting");
     if (testResult.supported)
     {
-        BOOST_TEST(CompareTensors(testResult.output, testResult.outputExpected));
+        BOOST_TEST(CompareTensors(testResult.output, testResult.outputExpected, testResult.compareBoolean));
     }
 }
 
-- 
cgit v1.2.1