aboutsummaryrefslogtreecommitdiff
path: root/tests/validation/CL/Permute.cpp
diff options
context:
space:
mode:
authorPablo Tello <pablo.tello@arm.com>2018-12-05 17:36:30 +0000
committerGeorgios Pinitas <georgios.pinitas@arm.com>2018-12-12 18:48:48 +0000
commit35767bc09f21050a9767a91b086b327afc928a81 (patch)
tree0b4b3dad94566ae3c52f847103b2577ada5dd06d /tests/validation/CL/Permute.cpp
parent1f8db2be160718979d38e3671a135d22e83cc5c2 (diff)
downloadComputeLibrary-35767bc09f21050a9767a91b086b327afc928a81.tar.gz
COMPMID-1697: NEPermute extended support for more cases.
Regardless the input data layout NEPermute function has been added support for the all the permutations of 4d tensors Added corresponding validation tests. Change-Id: I0f8f20c2c3716e908a18a59783be53efab80ef5b Reviewed-on: https://review.mlplatform.org/367 Reviewed-by: Giuseppe Rossini <giuseppe.rossini@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/CL/Permute.cpp')
-rw-r--r--tests/validation/CL/Permute.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/validation/CL/Permute.cpp b/tests/validation/CL/Permute.cpp
index 1371e717e7..a75b8cf9cd 100644
--- a/tests/validation/CL/Permute.cpp
+++ b/tests/validation/CL/Permute.cpp
@@ -42,10 +42,16 @@ namespace validation
{
namespace
{
-const auto PermuteParametersSmall = combine(datasets::Small4DShapes(),
- framework::dataset::make("PermutationVector", { PermutationVector(2U, 0U, 1U), PermutationVector(1U, 2U, 0U), PermutationVector(3U, 2U, 0U, 1U) }));
-const auto PermuteParametersLarge = combine(datasets::Large4DShapes(),
- framework::dataset::make("PermutationVector", { PermutationVector(2U, 0U, 1U), PermutationVector(1U, 2U, 0U), PermutationVector(3U, 2U, 0U, 1U) }));
+const auto PermuteVectors = framework::dataset::make("PermutationVector",
+{
+ PermutationVector(2U, 0U, 1U),
+ PermutationVector(1U, 2U, 0U),
+ PermutationVector(3U, 2U, 0U, 1U)
+});
+const auto PermuteInputLayout = framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC });
+const auto PermuteParametersSmall = concat(concat(datasets::Small2DShapes(), datasets::Small3DShapes()), datasets::Small4DShapes()) * PermuteInputLayout * PermuteVectors;
+const auto PermuteParametersLarge = datasets::Large4DShapes() * PermuteInputLayout * PermuteVectors;
+
} // namespace
TEST_SUITE(CL)
TEST_SUITE(Permute)