From 941cd706bea1847ae89e4ee13f144fc51050ad1f Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Tue, 12 Dec 2017 14:35:00 +0000 Subject: COMPMID-688: Shorten DepthWiseConvolution test name. Removed biases shape from the dataset which is redundant as it can be computed from the weights shape. Change-Id: I078b6eeb9e0a42f697e7b311deb86d2a1795872b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/112904 Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com Reviewed-by: Georgios Pinitas --- tests/validation/NEON/DepthwiseConvolutionLayer.cpp | 15 ++++++++------- .../fixtures/DepthwiseConvolutionLayerFixture.h | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) (limited to 'tests/validation') diff --git a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp index 17eaaf8ad7..420c9744d8 100644 --- a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp +++ b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp @@ -46,18 +46,19 @@ constexpr RelativeTolerance tolerance_f32(0.01f); /**< Tolerance value fo } // namespace TEST_SUITE(NEON) -TEST_SUITE(DepthwiseConvolutionLayer) +TEST_SUITE(DepthwiseConvLayer) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(framework::dataset::concat(datasets::SmallDepthwiseConvolutionLayerDataset3x3(), datasets::LargeDepthwiseConvolutionLayerDataset3x3()), framework::dataset::make("DataType", DataType::F32)), - input_shape, weights_shape, bias_shape, output_shape, info, data_type) + input_shape, weights_shape, output_shape, info, data_type) { // Create tensors - Tensor src = create_tensor(input_shape, data_type); - Tensor dst = create_tensor(output_shape, data_type); - Tensor weights = create_tensor(weights_shape, data_type); - Tensor bias = create_tensor(bias_shape, data_type); + Tensor src = create_tensor(input_shape, data_type); + Tensor dst = create_tensor(output_shape, data_type); + Tensor weights = create_tensor(weights_shape, data_type); + const TensorShape bias_shape(weights_shape[2]); + Tensor bias = create_tensor(bias_shape, data_type); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); @@ -120,8 +121,8 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEDepthwiseConvolutionLayerFixture3x3, f validate(Accessor(_target), _reference, tolerance_f32); } TEST_SUITE_END() - TEST_SUITE_END() + TEST_SUITE_END() TEST_SUITE_END() diff --git a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h index 4426215114..3683f7214a 100644 --- a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h +++ b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h @@ -50,12 +50,12 @@ public: public: template - void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type, QuantizationInfo quantization_info) + void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type, QuantizationInfo quantization_info) { _quantization_info = quantization_info; _data_type = data_type; - - const DataType bias_data_type = is_data_type_quantized_asymmetric(data_type) ? DataType::S32 : data_type; + const TensorShape biases_shape(weights_shape[2]); + const DataType bias_data_type = is_data_type_quantized_asymmetric(data_type) ? DataType::S32 : data_type; _target = compute_target(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, data_type, bias_data_type, quantization_info); _reference = compute_reference(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, data_type, bias_data_type, quantization_info); @@ -155,9 +155,9 @@ class DepthwiseConvolutionLayerValidationFixture : public DepthwiseConvolutionLa { public: template - void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type) + void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type) { - DepthwiseConvolutionLayerValidationGenericFixture::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, + DepthwiseConvolutionLayerValidationGenericFixture::setup(in_shape, weights_shape, out_shape, pad_stride_info, data_type, QuantizationInfo()); } }; @@ -167,9 +167,9 @@ class DepthwiseConvolutionLayerValidationQuantizedFixture : public DepthwiseConv { public: template - void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type, QuantizationInfo quantization_info) + void setup(TensorShape in_shape, TensorShape weights_shape, TensorShape out_shape, PadStrideInfo pad_stride_info, DataType data_type, QuantizationInfo quantization_info) { - DepthwiseConvolutionLayerValidationGenericFixture::setup(in_shape, weights_shape, biases_shape, out_shape, pad_stride_info, + DepthwiseConvolutionLayerValidationGenericFixture::setup(in_shape, weights_shape, out_shape, pad_stride_info, data_type, quantization_info); } }; -- cgit v1.2.1