From 77bfb5e32faadb1383d48364a6f54adbff84ad80 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Wed, 16 Oct 2019 17:45:38 +0100 Subject: IVGCVSW-3993 Add frontend and reference workload for ComparisonLayer * Added frontend for ComparisonLayer * Added RefComparisonWorkload * Deprecated and removed Equal and Greater layers and workloads * Updated tests to ensure backward compatibility Signed-off-by: Aron Virginas-Tar Change-Id: Id50c880be1b567c531efff919c0c366d0a71cbe9 --- src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | 9 ++++++++- src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | 1 + src/armnn/test/TestNameOnlyLayerVisitor.cpp | 2 -- src/armnn/test/TestNameOnlyLayerVisitor.hpp | 2 -- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/armnn/test') diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index 0b126235e8..36bbd36792 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -64,6 +64,12 @@ armnn::BatchToSpaceNdDescriptor GetDescriptor() return armnn::BatchToSpaceNdDescriptor({ 1, 1 }, {{ 0, 0 }, { 0, 0 }}); } +template<> +armnn::ComparisonDescriptor GetDescriptor() +{ + return armnn::ComparisonDescriptor(armnn::ComparisonOperation::GreaterOrEqual); +} + template<> armnn::ConcatDescriptor GetDescriptor() { @@ -243,6 +249,7 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Activation) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(ArgMinMax) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(DepthToSpace) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(BatchToSpaceNd) +TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Comparison) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Concat) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(InstanceNormalization) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(L2Normalization) @@ -262,4 +269,4 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Splitter) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Stack) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(StridedSlice) -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index aefcba5f59..b1f7f57075 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -46,6 +46,7 @@ public: \ DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Activation) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(ArgMinMax) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(BatchToSpaceNd) +DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Comparison) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Concat) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(DepthToSpace) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(InstanceNormalization) diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.cpp b/src/armnn/test/TestNameOnlyLayerVisitor.cpp index 6bc2dc7c65..32de94e7ef 100644 --- a/src/armnn/test/TestNameOnlyLayerVisitor.cpp +++ b/src/armnn/test/TestNameOnlyLayerVisitor.cpp @@ -42,10 +42,8 @@ TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Abs) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Addition) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Dequantize) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Division) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Equal) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Floor) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Gather) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Greater) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Maximum) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Merge) TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Minimum) diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.hpp b/src/armnn/test/TestNameOnlyLayerVisitor.hpp index a772cb3283..c770b5e9e0 100644 --- a/src/armnn/test/TestNameOnlyLayerVisitor.hpp +++ b/src/armnn/test/TestNameOnlyLayerVisitor.hpp @@ -29,10 +29,8 @@ DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Abs) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Addition) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Dequantize) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Division) -DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Equal) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Floor) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Gather) -DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Greater) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Maximum) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Merge) DECLARE_TEST_NAME_ONLY_LAYER_VISITOR_CLASS(Minimum) -- cgit v1.2.1