From c2d0e203ac28458b47c25d0129ccff6ca707ca56 Mon Sep 17 00:00:00 2001
From: Freddie Liardet <frederick.liardet@arm.com>
Date: Fri, 7 May 2021 09:03:12 +0100
Subject: Fix bug in Select operator when input is 1xN

Fix issue where gpu select kernel would not compile when input was 1xN
size.

Also add relevant tests for 1xN input.

Resolves: COMPMID-4357

Signed-off-by: Freddie Liardet <frederick.liardet@arm.com>
Change-Id: Ib5f339379e9cc7ef05605312889dbad34cbfe5dd
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5620
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 tests/validation/CL/Select.cpp | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'tests/validation')

diff --git a/tests/validation/CL/Select.cpp b/tests/validation/CL/Select.cpp
index 3d7c61aab5..d3540cae48 100644
--- a/tests/validation/CL/Select.cpp
+++ b/tests/validation/CL/Select.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020 Arm Limited.
+ * Copyright (c) 2018-2021 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -107,6 +107,17 @@ FIXTURE_DATA_TEST_CASE(RunSmall,
     validate(CLAccessor(_target), _reference);
 }
 
+FIXTURE_DATA_TEST_CASE(RunOneDim,
+                       CLSelectFixture<half>,
+                       framework::DatasetMode::PRECOMMIT,
+                       combine(combine(framework::dataset::make("Shape", TensorShape(1U, 16U)),
+                                       framework::dataset::make("has_same_rank", { false, true })),
+                               framework::dataset::make("DataType", DataType::F16)))
+{
+    // Validate output
+    validate(CLAccessor(_target), _reference);
+}
+
 FIXTURE_DATA_TEST_CASE(RunLarge,
                        CLSelectFixture<half>,
                        framework::DatasetMode::NIGHTLY,
@@ -127,6 +138,17 @@ FIXTURE_DATA_TEST_CASE(RunSmall,
     validate(CLAccessor(_target), _reference);
 }
 
+FIXTURE_DATA_TEST_CASE(RunOneDim,
+                       CLSelectFixture<float>,
+                       framework::DatasetMode::PRECOMMIT,
+                       combine(combine(framework::dataset::make("Shape", TensorShape(1U, 16U)),
+                                       framework::dataset::make("has_same_rank", { false, true })),
+                               framework::dataset::make("DataType", DataType::F32)))
+{
+    // Validate output
+    validate(CLAccessor(_target), _reference);
+}
+
 FIXTURE_DATA_TEST_CASE(RunLarge,
                        CLSelectFixture<float>,
                        framework::DatasetMode::NIGHTLY,
@@ -149,6 +171,17 @@ FIXTURE_DATA_TEST_CASE(RunSmall,
     validate(CLAccessor(_target), _reference);
 }
 
+FIXTURE_DATA_TEST_CASE(RunOneDim,
+                       CLSelectFixture<uint8_t>,
+                       framework::DatasetMode::PRECOMMIT,
+                       combine(combine(framework::dataset::make("Shape", TensorShape(1U, 16U)),
+                                       framework::dataset::make("has_same_rank", { false, true })),
+                               framework::dataset::make("DataType", DataType::QASYMM8)))
+{
+    // Validate output
+    validate(CLAccessor(_target), _reference);
+}
+
 FIXTURE_DATA_TEST_CASE(RunLarge,
                        CLSelectFixture<uint8_t>,
                        framework::DatasetMode::NIGHTLY,
-- 
cgit v1.2.1