From 226e4b92b191491ffa57ede66eba1d5d6fcf3b76 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Thu, 23 Aug 2018 12:00:02 +0100 Subject: COMPMID-1470 Add auto-init of the output in NECol2im The output of NECol2Im is already auto-initialized. This patch is about calling ShapeCalculator instead of computing the shape inside the kernel, adding validate_and_configure_window, and standardize the way convolved dims are passed (now NEON uses Size2D, while CL passes a pair of uint values: using Size2D for both implementations) Change-Id: I795696e1b6532f57847c3186c1b532c09f5a25da Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/145345 Tested-by: Jenkins Reviewed-by: Michele DiGiorgio Reviewed-by: Georgios Pinitas --- tests/validation/CL/Col2Im.cpp | 4 ++-- tests/validation/fixtures/Col2ImFixture.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/validation/CL/Col2Im.cpp b/tests/validation/CL/Col2Im.cpp index 6f1163c278..1fea5c1111 100644 --- a/tests/validation/CL/Col2Im.cpp +++ b/tests/validation/CL/Col2Im.cpp @@ -63,14 +63,14 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip(zip( framework::dataset::make("Expected", { false, false, false, true })), input_info, output_info, convolved_width, convolved_height, num_groups, expected) { - bool status = bool(CLCol2Im::validate(&input_info, &output_info, std::make_pair(convolved_width, convolved_height), num_groups)); + bool status = bool(CLCol2Im::validate(&input_info, &output_info, Size2D(convolved_width, convolved_height), num_groups)); ARM_COMPUTE_EXPECT(status == expected, framework::LogLevel::ERRORS); } // clang-format on // *INDENT-ON* template -using CLCol2ImFixture = Col2ImValidationFixture; +using CLCol2ImFixture = Col2ImValidationFixture; TEST_SUITE(Float) TEST_SUITE(FP32) diff --git a/tests/validation/fixtures/Col2ImFixture.h b/tests/validation/fixtures/Col2ImFixture.h index ddc78a5032..5488f8a3ea 100644 --- a/tests/validation/fixtures/Col2ImFixture.h +++ b/tests/validation/fixtures/Col2ImFixture.h @@ -44,16 +44,16 @@ namespace validation { using namespace arm_compute::misc::shape_calculator; -template +template class Col2ImValidationFixture : public framework::Fixture { public: template void setup(TensorShape input_shape, const unsigned int convolved_width, unsigned int convolved_height, unsigned int num_groups, DataType data_type) { - const std::pair convolved_dims(convolved_width, convolved_height); + const Size2D convolved_dims(convolved_width, convolved_height); - const TensorShape output_shape = compute_col2im_shape(TensorInfo(input_shape, 1, data_type), convolved_dims, num_groups); + const TensorShape output_shape = compute_col2im_shape(TensorInfo(input_shape, 1, data_type), convolved_dims, batch_size_on_z, num_groups); _target = compute_target(input_shape, output_shape, convolved_dims, num_groups, data_type); _reference = compute_reference(input_shape, output_shape, num_groups, data_type); @@ -66,7 +66,7 @@ protected: library->fill_tensor_uniform(tensor, seed); } - TensorType compute_target(const TensorShape &input_shape, const TensorShape &output_shape, std::pair convolved_dims, unsigned int num_groups, DataType data_type) + TensorType compute_target(const TensorShape &input_shape, const TensorShape &output_shape, const Size2D &convolved_dims, unsigned int num_groups, DataType data_type) { // Create tensors TensorType src = create_tensor(input_shape, data_type); -- cgit v1.2.1