From e37662a34659a2d6649b9793e62f6a9110437684 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Wed, 29 Apr 2020 15:14:18 +0100 Subject: COMPMID-3128: Test improvement for GEMMConvolutionLayer on CL and NEON(Function-level) Cleaning up GEMMConvolutionLayer tests by doing the following: - Remove unnecessary configuration tests - Remove redundant tests > Redundant shapes > For large shapes there are already tests for each internal kernel/function - Test NHWC 1x1 kernel 1x1 stride to stress _skip_im2col - Stimulate gemm3d to skip col2im - Test asymmetric padding - Test batch size equal to one and different than one - Test fully connected convolution - Test with a few different padding values - Test 1D kernel - Test with FLOOR rounding policy Change-Id: I88e7009b8e9c991994ed264476c16a79a0de4a68 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3150 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Sang-Hoon Park --- tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp | 46 +--------------------- 1 file changed, 1 insertion(+), 45 deletions(-) (limited to 'tests/validation/GLES_COMPUTE') diff --git a/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp b/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp index 364eb6e6d2..2813d29e72 100644 --- a/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp +++ b/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -65,50 +65,6 @@ const auto ActivationFunctionsDataset = framework::dataset::make("ActivationInfo TEST_SUITE(GC) TEST_SUITE(ConvolutionLayer) -DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(datasets::SmallConvolutionLayerReducedDataset(), - CNNDataTypes), - ActivationFunctionsDataset), - input_shape, weights_shape, bias_shape, output_shape, info, dilation, data_type, act_info) -{ - auto bias_data_type = is_data_type_quantized_asymmetric(data_type) ? DataType::S32 : data_type; - - // Create tensors - GCTensor src = create_tensor(input_shape, data_type, 1, QuantizationInfo(2.f / 255.f, 127)); - GCTensor weights = create_tensor(weights_shape, data_type, 1, QuantizationInfo(2.f / 255.f, 127)); - GCTensor bias = create_tensor(bias_shape, bias_data_type, 1, QuantizationInfo(2.f / 255.f, 127)); - GCTensor dst = create_tensor(output_shape, data_type, 1, QuantizationInfo(2.f / 255.f, 127)); - - ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(weights.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(bias.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - const QuantizationInfo src_quantization_info = src.info()->quantization_info(); - const QuantizationInfo weights_quantization_info = weights.info()->quantization_info(); - - // Create and configure function - GCConvolutionLayer conv; - conv.configure(&src, &weights, &bias, &dst, info, WeightsInfo(), dilation, act_info); - - // Validate valid region - const ValidRegion src_valid_region = shape_to_valid_region(input_shape); - const ValidRegion weights_valid_region = shape_to_valid_region(weights_shape); - const ValidRegion bias_valid_region = shape_to_valid_region(bias_shape); - const ValidRegion dst_valid_region = shape_to_valid_region(output_shape); - - validate(src.info()->valid_region(), src_valid_region); - validate(weights.info()->valid_region(), weights_valid_region); - validate(bias.info()->valid_region(), bias_valid_region); - validate(dst.info()->valid_region(), dst_valid_region); - - // Validate QuantizationInfo - ARM_COMPUTE_EXPECT(src.info()->quantization_info() == src_quantization_info, framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(weights.info()->quantization_info() == weights_quantization_info, framework::LogLevel::ERRORS); - - //Validate padding - //TODO(COMPMID-415) Need to validate padding? -} - template using GCConvolutionLayerFixture = ConvolutionValidationFixture; -- cgit v1.2.1