diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2018-08-20 18:03:27 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
| commit | fb62908bd8148bd347bd204e881156f8ebf7835d (patch) | |
| tree | 78843eb937bb64f5e3439b8367f9cb6d7140d7b2 /tests/validation/fixtures | |
| parent | 66cbafb26261fbf091b799d1e5d0600fb08ee513 (diff) | |
| download | ComputeLibrary-fb62908bd8148bd347bd204e881156f8ebf7835d.tar.gz | |
COMPMID-1494 Optimise NEON im2col and weights reshape for NHWC
Change-Id: I99ebae61024a7bce9d17292a02c28626ae6c29d5
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/144872
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'tests/validation/fixtures')
| -rw-r--r-- | tests/validation/fixtures/Im2ColFixture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/validation/fixtures/Im2ColFixture.h b/tests/validation/fixtures/Im2ColFixture.h index b5e83a9872..809bafd0b2 100644 --- a/tests/validation/fixtures/Im2ColFixture.h +++ b/tests/validation/fixtures/Im2ColFixture.h @@ -50,7 +50,7 @@ class Im2ColValidationFixture : public framework::Fixture public: template <typename...> void setup(TensorShape input_shape, DataType data_type, const Size2D &kernel_dims, const PadStrideInfo &conv_info, const QuantizationInfo &quant_info, const DataLayout &data_layout, - unsigned int num_groups, bool channels_first_output_nhwc) + unsigned int num_groups) { _kernel_dims = kernel_dims; _conv_info = conv_info; @@ -70,7 +70,7 @@ public: const TensorShape output_shape = compute_im2col_conv_shape(&input_info, _kernel_dims, _conv_info, _has_bias, Size2D(1U, 1U), batch_size_on_z && _num_groups == 1, _num_groups); _target = compute_target(input_shape, output_shape, data_type); - compute_reference(input_shape, output_shape, data_type, channels_first_output_nhwc); + compute_reference(input_shape, output_shape, data_type); } protected: @@ -109,7 +109,7 @@ protected: return dst; } - void compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, DataType data_type, bool channels_first_output_nhwc) + void compute_reference(const TensorShape &input_shape, const TensorShape &output_shape, DataType data_type) { // Create reference SimpleTensor<T> src{ input_shape, data_type, 1, _quant_info, _data_layout }; @@ -118,7 +118,7 @@ protected: // Fill reference fill(src); - reference::im2col<T>(src, _reference, _kernel_dims, _conv_info, _has_bias, _num_groups, channels_first_output_nhwc); + reference::im2col<T>(src, _reference, _kernel_dims, _conv_info, _has_bias, _num_groups); } TensorType _target{}; SimpleTensor<T> _reference{}; |