IVGCVSW-3992 Add serialization support for ComparisonLayer

* Added serialization support and serialization-deserialization test
  for Comparison
* Added backward compatibility tests for Equal and Greater, to make
  sure they are serialized and deserialized as Comparison
* Refactored serialization tests and reduced code duplication by
  taking advantage of operator==() recently added for Descriptors

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Id0fd94ef4b17e4e51c8005e585ea3c47f9c1bd8d

1 files changed, 20 insertions, 2 deletions

diff --git a/src/armnnSerializer/SerializerUtils.cpp b/src/armnnSerializer/SerializerUtils.cpp
index 9790d6e23b..719f8a92dd 100644
--- a/src/armnnSerializer/SerializerUtils.cpp
+++ b/src/armnnSerializer/SerializerUtils.cpp
@@ -8,7 +8,25 @@
 namespace armnnSerializer
 {
 
-using namespace armnn;
+armnnSerializer::ComparisonOperation GetFlatBufferComparisonOperation(armnn::ComparisonOperation comparisonOperation)
+{
+    switch (comparisonOperation)
+    {
+        case armnn::ComparisonOperation::Equal:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_Equal;
+        case armnn::ComparisonOperation::Greater:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_Greater;
+        case armnn::ComparisonOperation::GreaterOrEqual:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_GreaterOrEqual;
+        case armnn::ComparisonOperation::Less:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_Less;
+        case armnn::ComparisonOperation::LessOrEqual:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_LessOrEqual;
+        case armnn::ComparisonOperation::NotEqual:
+        default:
+            return armnnSerializer::ComparisonOperation::ComparisonOperation_NotEqual;
+    }
+}
 
 armnnSerializer::ConstTensorData GetFlatBufferConstTensorData(armnn::DataType dataType)
 {
@@ -137,4 +155,4 @@ armnnSerializer::ResizeMethod GetFlatBufferResizeMethod(armnn::ResizeMethod meth
     }
 }
 
-} // namespace armnnSerializer
\ No newline at end of file
+} // namespace armnnSerializer