From 2d9de0a3fa6ad858e70040124f362799a962bb6a Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Thu, 15 Mar 2018 17:58:20 +0000 Subject: COMPMID-1009 Support 4x4 output tile for Winograd Filter Transform on OpenCL. Change-Id: I68c6453e0f192de659582404f109a89616b9fbb9 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124811 Tested-by: Jenkins Reviewed-by: Georgios Pinitas Reviewed-by: Gian Marco Iodice --- tests/validation/fixtures/WinogradLayerFixture.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/validation/fixtures/WinogradLayerFixture.h') diff --git a/tests/validation/fixtures/WinogradLayerFixture.h b/tests/validation/fixtures/WinogradLayerFixture.h index 9811c28008..c427f8d20e 100644 --- a/tests/validation/fixtures/WinogradLayerFixture.h +++ b/tests/validation/fixtures/WinogradLayerFixture.h @@ -225,12 +225,12 @@ class WinogradFilterTransformValidationFixture : public framework::Fixture { public: template - void setup(TensorShape input_shape, bool is_nchw_format, DataType data_type) + void setup(TensorShape input_shape, bool is_nchw_format, Size2D output_tile, DataType data_type) { - TensorShape output_shape = compute_winograd_filter_transform_shape(TensorInfo(input_shape, 1, data_type)); + TensorShape output_shape = compute_winograd_filter_transform_shape(TensorInfo(input_shape, 1, data_type), output_tile); - _target = compute_target(input_shape, output_shape, is_nchw_format, data_type); - _reference = compute_reference(input_shape, output_shape, is_nchw_format, data_type); + _target = compute_target(input_shape, output_shape, is_nchw_format, output_tile, data_type); + _reference = compute_reference(input_shape, output_shape, is_nchw_format, output_tile, data_type); } protected: @@ -254,7 +254,7 @@ protected: } } - TensorType compute_target(const TensorShape &input_shape, const TensorShape &output_shape, bool is_nchw_format, DataType data_type) + TensorType compute_target(const TensorShape &input_shape, const TensorShape &output_shape, bool is_nchw_format, const Size2D &output_tile, DataType data_type) { ARM_COMPUTE_UNUSED(is_nchw_format); @@ -264,7 +264,7 @@ protected: // Create and configure function FunctionType filter_transform; - filter_transform.configure(&src, &dst); + filter_transform.configure(&src, &dst, output_tile); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); @@ -284,7 +284,7 @@ protected: return dst; } - SimpleTensor compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, bool is_nchw_format, DataType data_type) + SimpleTensor compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, bool is_nchw_format, const Size2D &output_tile, DataType data_type) { ARM_COMPUTE_UNUSED(is_nchw_format); @@ -294,7 +294,7 @@ protected: // Fill reference fill(src, 0, -1.f, 1.f); - return reference::winograd_filter_transform(src, output_shape); + return reference::winograd_filter_transform(src, output_shape, output_tile); } TensorType _target{}; -- cgit v1.2.1