commit 1426a3f52854d0d9457109c5f806bffde037bd34
author Ryan OShea <ryaosh02@e121865.galway.arm.com> Thu Jan 23 11:56:05 2020 +0000
committer Ryan O'Shea <ryan.oshea2@arm.com> Wed Jan 29 10:29:22 2020 +0000
tree 6e2c05b294cc9883086953dbb9ea67bc0298df4a
parent 5204aa8fd1da75ccc052269f358178b54bc7792f

IVGCVSW-4152 Remove check for QAsymm8 in ArgMinMax CL layer support

 * Added ClLayerTests
 * Added ClEndToEndTests

Signed-off-by: Ryan OShea <ryaosh02@e121865.galway.arm.com>
Change-Id: I1512ebae248dee9a0e6a8c4f52ecf99f677a22c6

src/backends/cl/ClLayerSupport.cpp

diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index ffe68a3..7bf7f15 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -194,10 +194,6 @@
                                           const ArgMinMaxDescriptor& descriptor,
                                           Optional<std::string&> reasonIfUnsupported) const
 {
-    if (input.GetDataType() == DataType::QAsymmU8)
-    {
-        return false;
-    }
 
     FORWARD_WORKLOAD_VALIDATE_FUNC(ClArgMinMaxWorkloadValidate,
                                    reasonIfUnsupported,

src/backends/cl/test/ClEndToEndTests.cpp

diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp
index eafdb7c..10abcc9 100644
--- a/src/backends/cl/test/ClEndToEndTests.cpp
+++ b/src/backends/cl/test/ClEndToEndTests.cpp
@@ -398,4 +398,54 @@
     ArgMinAxis3EndToEnd<armnn::DataType::Float32>(defaultBackends);
 }
 
+BOOST_AUTO_TEST_CASE(ClArgMaxSimpleTestQAsymmU8)
+{
+    ArgMaxEndToEndSimple<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinSimpleTestQAsymmU8)
+{
+    ArgMinEndToEndSimple<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis0TestQAsymmU8)
+{
+    ArgMaxAxis0EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis0TestQAsymmU8)
+{
+    ArgMinAxis0EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis1TestQAsymmU8)
+{
+    ArgMaxAxis1EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis1TestQAsymmU8)
+{
+    ArgMinAxis1EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis2TestQAsymmU8)
+{
+    ArgMaxAxis2EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis2TestQAsymmU8)
+{
+    ArgMinAxis2EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis3TestQAsymmU8)
+{
+    ArgMaxAxis3EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis3TestQAsymmU8)
+{
+    ArgMinAxis3EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

src/backends/cl/test/ClLayerTests.cpp

diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 76e5174..294c77b 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -902,6 +902,13 @@
 ARMNN_AUTO_TEST_CASE(ArgMaxHeight, ArgMaxHeightTest<DataType::Float32>)
 ARMNN_AUTO_TEST_CASE(ArgMinWidth, ArgMinWidthTest<DataType::Float32>)
 
+ARMNN_AUTO_TEST_CASE(ArgMinQAsymm8, ArgMinSimpleTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxQAsymm8, ArgMaxSimpleTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMinChannelQAsymm8, ArgMinChannelTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxChannelQAsymm8, ArgMaxChannelTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxHeightQAsymm8, ArgMaxHeightTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMinWidthQAsymm8, ArgMinWidthTest<DataType::QAsymmU8>)
+
 #if defined(ARMNNREF_ENABLED)
 
 // The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available