From 04a0706dddc6ca24cb80e3e0789c6b0f54c48b28 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 17 Nov 2020 14:09:01 +0000 Subject: COMPMID-3979 Sanitise Padding Removal epic * Add missing padding immutability asserts in all relevant CL kernels * Remove unnecessary zero padding validation tests. Change-Id: If93f9ccbc988e0286f5e7b135f812141476d5da0 Signed-off-by: SiCong Li Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4446 Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/Winograd.cpp | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'tests/validation/CL/Winograd.cpp') diff --git a/tests/validation/CL/Winograd.cpp b/tests/validation/CL/Winograd.cpp index f206e92493..750799ace2 100644 --- a/tests/validation/CL/Winograd.cpp +++ b/tests/validation/CL/Winograd.cpp @@ -183,28 +183,6 @@ const auto ActivationFunctionsSmallDataset = framework::dataset::make("Activatio ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::SOFT_RELU) }); -/** Zero padding test */ -bool validate_zero_padding(unsigned int width, unsigned height) -{ - TensorShape shape(width, height, 11, 1); - - WinogradInfo winograd_info = WinogradInfo(Size2D(4U, 4U), Size2D(5U, 5U), Size2D(width, height), PadStrideInfo(), DataLayout::NHWC); - - // Create tensors - CLTensor src = create_tensor(shape, DataType::F32, 1, QuantizationInfo(), DataLayout::NHWC); - CLTensor dst; - - src.info()->set_quantization_info(QuantizationInfo(1.f / 256.f, 0)); - dst.info()->set_quantization_info(QuantizationInfo(1.f / 256.f, 0)); - - CLWinogradInputTransform input_transform; - - input_transform.configure(&src, &dst, winograd_info); - - // Padding can be added along rhs and bias's X dimension - return src.info()->padding().empty() && dst.info()->padding().empty(); -} - } // namespace using namespace arm_compute::misc::shape_calculator; @@ -214,19 +192,6 @@ TEST_SUITE(Winograd) TEST_SUITE(InputTransform) -/** Validate zero padding tests - * - * A series of validation tests to check that no padding is added - */ -DATA_TEST_CASE(ValidateZeroPadding, framework::DatasetMode::ALL, zip( -framework::dataset::make("Width", { 32U, 37U, 12U, 1U }), -framework::dataset::make("Height", { 13U, 27U, 19U, 1U })), -width, height) -{ - bool status = validate_zero_padding(width, height); - ARM_COMPUTE_EXPECT(status, framework::LogLevel::ERRORS); -} - DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( framework::dataset::make("InputInfo",{ TensorInfo(TensorShape(53U, 21U, 5U, 3U), 1, DataType::F16), // F16 not supported -- cgit v1.2.1