diff options
author | Annop Wongwathanarat <annop.wongwathanarat@arm.com> | 2024-06-11 08:59:51 +0000 |
---|---|---|
committer | Annop Wongwathanarat <annop.wongwathanarat@arm.com> | 2024-07-01 20:32:58 +0000 |
commit | f92b0fffa0d32dc08340c1abfa1a7f09c6e53795 (patch) | |
tree | 67a6237fec7bfbe879d8be9240f4cc19c198bc2c /tests | |
parent | 296173541a9a894d9d0639d7c762dd29b4847b75 (diff) | |
download | ComputeLibrary-f92b0fffa0d32dc08340c1abfa1a7f09c6e53795.tar.gz |
Provide a wrapper class to expose cpu::CpuTranspose
This wrapper allows us to utilize the functionality of CpuTranspose
without directly exposing the source code.
Change-Id: I4e2fa7d826c96260b604126b6a6a4d46f0f8e8c5
Signed-off-by: Annop Wongwathanarat <annop.wongwathanarat@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/11793
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/SConscript | 3 | ||||
-rw-r--r-- | tests/validation/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/validation/fixtures/CpuTransposeFixture.h | 110 | ||||
-rw-r--r-- | tests/validation/runtime/experimental/operators/CpuTranspose.cpp | 66 |
4 files changed, 181 insertions, 1 deletions
diff --git a/tests/SConscript b/tests/SConscript index 9f8bb54dec..c7be105b1e 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -117,6 +117,9 @@ files_validation += Glob('validation/UNIT/*.cpp') filter_pattern = test_env['test_filter'] files_validation += Glob('validation/CPP/' + filter_pattern) +# Add wrapper tests +files_validation += Glob('validation/runtime/*/' + filter_pattern) + if env['opencl']: if env['experimental_dynamic_fusion']: files_validation += Glob('validation/dynamic_fusion/gpu/' + filter_pattern) diff --git a/tests/validation/CMakeLists.txt b/tests/validation/CMakeLists.txt index b71787db60..174dfa88d2 100644 --- a/tests/validation/CMakeLists.txt +++ b/tests/validation/CMakeLists.txt @@ -143,5 +143,6 @@ if(ENABLE_NEON) NEON/UNIT/TensorAllocator.cpp NEON/UNIT/MemoryManager.cpp NEON/UNIT/RuntimeContext.cpp - runtime/experimental/operators/CpuGemm.cpp) + runtime/experimental/operators/CpuGemm.cpp + runtime/experimental/operators/CpuTranspose.cpp) endif() diff --git a/tests/validation/fixtures/CpuTransposeFixture.h b/tests/validation/fixtures/CpuTransposeFixture.h new file mode 100644 index 0000000000..4d08334bad --- /dev/null +++ b/tests/validation/fixtures/CpuTransposeFixture.h @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2024 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ACL_TESTS_VALIDATION_FIXTURES_CPUTRANSPOSEFIXTURE_H +#define ACL_TESTS_VALIDATION_FIXTURES_CPUTRANSPOSEFIXTURE_H + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/reference/Permute.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template <typename TensorType, typename AccessorType, typename FunctionType, typename T> +class CpuTransposeValidationFixture : public framework::Fixture +{ +public: + void setup(TensorShape shape, DataType data_type) + { + _target = compute_target(shape, data_type); + _reference = compute_reference(shape, data_type); + } + +protected: + template <typename U> + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + + TensorType compute_target(const TensorShape &shape, DataType data_type) + { + // Make rows the columns of the original shape + TensorShape output_shape{ shape[1], shape[0] }; + + // Create tensors + TensorType src = create_tensor<TensorType>(shape, data_type); + TensorType dst = create_tensor<TensorType>(output_shape, data_type); + + // Create and configure function + FunctionType trans_func; + trans_func.configure(src.info(), dst.info()); + + ARM_COMPUTE_ASSERT(src.info()->is_resizable()); + ARM_COMPUTE_ASSERT(dst.info()->is_resizable()); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_ASSERT(!src.info()->is_resizable()); + ARM_COMPUTE_ASSERT(!dst.info()->is_resizable()); + + // Fill tensors + fill(AccessorType(src)); + + // Compute function + ITensorPack run_pack{ { arm_compute::TensorType::ACL_SRC, &src }, { arm_compute::TensorType::ACL_DST, &dst } }; + trans_func.run(run_pack); + + return dst; + } + + SimpleTensor<T> compute_reference(const TensorShape &shape, DataType data_type) + { + // Create reference + SimpleTensor<T> src{ shape, data_type }; + + // Fill reference + fill(src); + + return reference::permute<T>(src, PermutationVector(1U, 0U)); + } + + TensorType _target{}; + SimpleTensor<T> _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif // ACL_TESTS_VALIDATION_FIXTURES_CPUTRANSPOSEFIXTURE_H diff --git a/tests/validation/runtime/experimental/operators/CpuTranspose.cpp b/tests/validation/runtime/experimental/operators/CpuTranspose.cpp new file mode 100644 index 0000000000..ccc33d5668 --- /dev/null +++ b/tests/validation/runtime/experimental/operators/CpuTranspose.cpp @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2024 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/runtime/experimental/operators/CpuTranspose.h" +#include "tests/NEON/Accessor.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/CpuTransposeFixture.h" + +/* + * Tests for arm_compute::experimental::op::CpuTranspose which is a shallow wrapper for + * arm_compute::cpu::CpuTranspose. Any future testing to the functionalities of cpu::CpuTranspose + * will be tested in tests/NEON/Transpose.cpp given that op::CpuTranspose remain a shallow wrapper. +*/ + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(NEON) +TEST_SUITE(OPERATORS) + +TEST_SUITE(CpuTranspose) + +template <typename T> +using CpuTransposeFixture = CpuTransposeValidationFixture<Tensor, Accessor, experimental::op::CpuTranspose, T>; + +TEST_SUITE(U8) +FIXTURE_DATA_TEST_CASE(SmokeTest, CpuTransposeFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(concat(datasets::Small1DShapes(), datasets::Small2DShapes()), + framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // U8 + +TEST_SUITE_END() // CpuTranspose + +TEST_SUITE_END() // OPERATORS +TEST_SUITE_END() // NEON +} // namespace validation +} // namespace test +} // namespace arm_compute |