diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-05-14 14:43:29 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:52:35 +0000 |
| commit | a8a4d9e943f4874500edc0e41b37fd794c02149f (patch) | |
| tree | 612af2744240327d2ee8bbebab232500bbabc211 | |
| parent | 73d4aef12463ac42fa9e31174675f32535a7edd8 (diff) | |
| download | ComputeLibrary-a8a4d9e943f4874500edc0e41b37fd794c02149f.tar.gz | |
COMPMID-959: Fixed typo in CLPermute::validate()
Change-Id: I54e58cb0b0cdd90bbb8dc2be4f06b76af88dc26d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/131054
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Isabella Gottardi <isabella.gottardi@arm.com>
| -rw-r--r-- | src/core/CL/kernels/CLPermuteKernel.cpp | 2 | ||||
| -rw-r--r-- | src/runtime/CL/functions/CLPermute.cpp | 4 | ||||
| -rw-r--r-- | tests/validation/CL/Permute.cpp | 26 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/core/CL/kernels/CLPermuteKernel.cpp b/src/core/CL/kernels/CLPermuteKernel.cpp index 02fc667aee..d20bee13f5 100644 --- a/src/core/CL/kernels/CLPermuteKernel.cpp +++ b/src/core/CL/kernels/CLPermuteKernel.cpp @@ -125,7 +125,7 @@ void CLPermuteKernel::configure(const ICLTensor *input, ICLTensor *output, const Status CLPermuteKernel::validate(const ITensorInfo *input, const ITensorInfo *output, const PermutationVector &perm) { ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output); - ARM_COMPUTE_RETURN_ERROR_ON(validate_arguments(input, output, perm)); + ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(input, output, perm)); return Status{}; } diff --git a/src/runtime/CL/functions/CLPermute.cpp b/src/runtime/CL/functions/CLPermute.cpp index 146856cd77..55b76495b3 100644 --- a/src/runtime/CL/functions/CLPermute.cpp +++ b/src/runtime/CL/functions/CLPermute.cpp @@ -39,6 +39,6 @@ void CLPermute::configure(const ICLTensor *input, ICLTensor *output, const Permu Status CLPermute::validate(const ITensorInfo *input, const ITensorInfo *output, const PermutationVector &perm) { - ARM_COMPUTE_RETURN_ERROR_ON(CLPermuteKernel::validate(input, output, perm)); + ARM_COMPUTE_RETURN_ON_ERROR(CLPermuteKernel::validate(input, output, perm)); return Status{}; -}
\ No newline at end of file +} diff --git a/tests/validation/CL/Permute.cpp b/tests/validation/CL/Permute.cpp index bdd8f6e449..1371e717e7 100644 --- a/tests/validation/CL/Permute.cpp +++ b/tests/validation/CL/Permute.cpp @@ -53,7 +53,7 @@ TEST_SUITE(Permute) // *INDENT-OFF* // clang-format off DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( - framework::dataset::make("InputInfo",{ + framework::dataset::make("InputInfo",{ TensorInfo(TensorShape(7U, 7U, 5U, 3U), 1, DataType::U16), // permutation not supported TensorInfo(TensorShape(7U, 7U, 5U, 3U), 1, DataType::U16), // permutation not supported TensorInfo(TensorShape(7U, 7U, 5U, 3U), 1, DataType::U16), // permutation not supported @@ -66,27 +66,27 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(128U, 64U, 21U, 2U), 1, DataType::F32), // permutation not supported TensorInfo(TensorShape(128U, 64U, 21U, 2U), 1, DataType::U16), // permutation not supported }), - framework::dataset::make("OutputInfo", { - TensorInfo(TensorShape(5U, 7U, 7U, 3U), 1, DataType::U16), - TensorInfo(TensorShape(5U, 5U, 7U, 3U), 1, DataType::U16), + framework::dataset::make("OutputInfo", { + TensorInfo(TensorShape(5U, 7U, 7U, 3U), 1, DataType::U16), + TensorInfo(TensorShape(5U, 5U, 7U, 3U), 1, DataType::U16), TensorInfo(TensorShape(7U, 7U, 7U, 3U), 1, DataType::U16), TensorInfo(TensorShape(5U, 7U), 1, DataType::U8), - TensorInfo(TensorShape(5U, 7U, 7U, 3U), 1, DataType::U16), - TensorInfo(TensorShape(13U, 37U, 27U, 2U), 1, DataType::F32), - TensorInfo(TensorShape(2U, 37U, 27U, 13U), 1, DataType::F32), + TensorInfo(TensorShape(5U, 7U, 7U, 3U), 1, DataType::U16), + TensorInfo(TensorShape(13U, 37U, 27U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(2U, 37U, 27U, 13U), 1, DataType::F32), TensorInfo(TensorShape(128U, 64U, 21U, 2U), 1, DataType::QASYMM8), TensorInfo(TensorShape(128U, 64U, 21U, 2U), 1, DataType::F32), - TensorInfo(TensorShape(21U, 64U, 2U, 128U), 1, DataType::F32), - TensorInfo(TensorShape(2U, 21U, 64U, 128U), 1, DataType::U16), + TensorInfo(TensorShape(21U, 64U, 2U, 128U), 1, DataType::F32), + TensorInfo(TensorShape(2U, 21U, 64U, 128U), 1, DataType::U16), })), - framework::dataset::make("PermutationVector", { + framework::dataset::make("PermutationVector", { PermutationVector(2U, 1U, 0U), PermutationVector(2U, 2U, 1U), PermutationVector(1U, 1U, 1U), PermutationVector(2U, 0U, 1U), - PermutationVector(2U, 0U, 1U), - PermutationVector(1U, 2U, 0U), - PermutationVector(3U, 2U, 0U, 1U), + PermutationVector(2U, 0U, 1U), + PermutationVector(1U, 2U, 0U), + PermutationVector(3U, 2U, 0U, 1U), PermutationVector(2U, 3U, 1U, 0U), PermutationVector(1U, 1U, 1U, 1U), PermutationVector(2U, 1U, 3U, 0U), |