From 5a7d1571a2de24eefc6f1d8d22deeef9f47521ee Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 21 Mar 2023 12:00:15 +0000 Subject: Fix BatchToSpaceFixture * Use a vector to represent the (static) block shape instead of an N-D Tensor. The previous use of ND Tensor as block shape was wrong, not adhering to the specification, and non-functional (only first dim was used anyway). * The fixture now accepts a static block shape, because the dynamic case is not properly implemented and will be deprecated for now. * Fix an assertion error in reference implementation. Partially resolves COMPMID-5918 Change-Id: I5221e52ccc05e7c1249dec3a42426f954a73729a Signed-off-by: SiCong Li Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9357 Tested-by: Arm Jenkins Reviewed-by: Pablo Marquez Tello Reviewed-by: Omar Al Khatib Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- .../validation/fixtures/BatchToSpaceLayerFixture.h | 56 +++++++--------------- 1 file changed, 16 insertions(+), 40 deletions(-) (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/BatchToSpaceLayerFixture.h b/tests/validation/fixtures/BatchToSpaceLayerFixture.h index 5a23261a6e..19fc82a87b 100644 --- a/tests/validation/fixtures/BatchToSpaceLayerFixture.h +++ b/tests/validation/fixtures/BatchToSpaceLayerFixture.h @@ -24,6 +24,7 @@ #ifndef ARM_COMPUTE_TEST_BATCH_TO_SPACE_LAYER_FIXTURE #define ARM_COMPUTE_TEST_BATCH_TO_SPACE_LAYER_FIXTURE +#include "arm_compute/core/Helpers.h" #include "tests/Globals.h" #include "tests/framework/Asserts.h" #include "tests/framework/Fixture.h" @@ -36,14 +37,14 @@ namespace test namespace validation { template -class BatchToSpaceLayerValidationGenericFixture : public framework::Fixture +class BatchToSpaceLayerValidationFixture : public framework::Fixture { public: template - void setup(TensorShape input_shape, TensorShape block_shape_shape, TensorShape output_shape, DataType data_type, DataLayout data_layout, const CropInfo &crop_info = CropInfo{}) + void setup(const TensorShape &input_shape, const std::vector &block_shape, const CropInfo &crop_info, const TensorShape &output_shape, DataType data_type, DataLayout data_layout) { - _target = compute_target(input_shape, block_shape_shape, output_shape, data_type, data_layout, crop_info); - _reference = compute_reference(input_shape, block_shape_shape, output_shape, data_type, crop_info); + _target = compute_target(input_shape, block_shape, crop_info, output_shape, data_type, data_layout); + _reference = compute_reference(input_shape, block_shape, crop_info, output_shape, data_type); } protected: @@ -56,9 +57,10 @@ protected: DistributionType distribution{ T(-1.0f), T(1.0f) }; library->fill(tensor, distribution, i); } - TensorType compute_target(TensorShape input_shape, TensorShape block_shape_shape, TensorShape output_shape, - DataType data_type, DataLayout data_layout, const CropInfo &crop_info) + TensorType compute_target(TensorShape input_shape, const std::vector &block_shape, const CropInfo &crop_info, TensorShape output_shape, + DataType data_type, DataLayout data_layout) { + ARM_COMPUTE_ERROR_ON(block_shape.size() != 2U); // Only support batch to 2D space (x, y) for now if(data_layout == DataLayout::NHWC) { permute(input_shape, PermutationVector(2U, 0U, 1U)); @@ -66,75 +68,49 @@ protected: } // Create tensors - TensorType input = create_tensor(input_shape, data_type, 1, QuantizationInfo(), data_layout); - TensorType block_shape = create_tensor(block_shape_shape, DataType::S32); - TensorType output = create_tensor(output_shape, data_type, 1, QuantizationInfo(), data_layout); + TensorType input = create_tensor(input_shape, data_type, 1, QuantizationInfo(), data_layout); + TensorType output = create_tensor(output_shape, data_type, 1, QuantizationInfo(), data_layout); // Create and configure function FunctionType batch_to_space; - batch_to_space.configure(&input, &block_shape, &output, crop_info); + batch_to_space.configure(&input, block_shape.at(0), block_shape.at(1), &output, crop_info); ARM_COMPUTE_ASSERT(input.info()->is_resizable()); - ARM_COMPUTE_ASSERT(block_shape.info()->is_resizable()); ARM_COMPUTE_ASSERT(output.info()->is_resizable()); // Allocate tensors input.allocator()->allocate(); - block_shape.allocator()->allocate(); output.allocator()->allocate(); ARM_COMPUTE_ASSERT(!input.info()->is_resizable()); - ARM_COMPUTE_ASSERT(!block_shape.info()->is_resizable()); ARM_COMPUTE_ASSERT(!output.info()->is_resizable()); // Fill tensors fill(AccessorType(input), 0); - { - auto block_shape_data = AccessorType(block_shape); - const int idx_width = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); - for(unsigned int i = 0; i < block_shape_shape.x(); ++i) - { - static_cast(block_shape_data.data())[i] = output_shape[i + idx_width] / input_shape[i + idx_width]; - } - } // Compute function batch_to_space.run(); return output; } - SimpleTensor compute_reference(const TensorShape &input_shape, const TensorShape &block_shape_shape, - const TensorShape &output_shape, DataType data_type, const CropInfo &crop_info) + SimpleTensor compute_reference(const TensorShape &input_shape, const std::vector &block_shape, + const CropInfo &crop_info, const TensorShape &output_shape, DataType data_type) { + ARM_COMPUTE_ERROR_ON(block_shape.size() != 2U); // Only support batch to 2D space (x, y) for now // Create reference - SimpleTensor input{ input_shape, data_type }; - SimpleTensor block_shape{ block_shape_shape, DataType::S32 }; + SimpleTensor input{ input_shape, data_type }; // Fill reference fill(input, 0); - for(unsigned int i = 0; i < block_shape_shape.x(); ++i) - { - block_shape[i] = output_shape[i] / input_shape[i]; - } // Compute reference - return reference::batch_to_space(input, block_shape, output_shape, crop_info); + return reference::batch_to_space(input, block_shape, crop_info, output_shape); } TensorType _target{}; SimpleTensor _reference{}; }; -template -class BatchToSpaceLayerValidationFixture : public BatchToSpaceLayerValidationGenericFixture -{ -public: - template - void setup(TensorShape input_shape, TensorShape block_shape_shape, TensorShape output_shape, DataType data_type, DataLayout data_layout) - { - BatchToSpaceLayerValidationGenericFixture::setup(input_shape, block_shape_shape, output_shape, data_type, data_layout, CropInfo{}); - } -}; } // namespace validation } // namespace test } // namespace arm_compute -- cgit v1.2.1