diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2018-08-01 15:06:06 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | 597a85666a84c9a9414264966651551564b79299 (patch) | |
tree | 6f2fd1bd8648c495b7e3324433ed902266fb2053 /src/core | |
parent | 883f489da93e88d74aa0dfb206c56697ba0e63f0 (diff) | |
download | ComputeLibrary-597a85666a84c9a9414264966651551564b79299.tar.gz |
COMPMID-872 - Rework NEGEMMConvolutionLayer to use NEGEMM
Change-Id: I55f0018ac7214775ebbca63f58a3bf5c93732fec
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/142632
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/NEON/kernels/NECol2ImKernel.cpp | 1 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEIm2ColKernel.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/NEON/kernels/NECol2ImKernel.cpp b/src/core/NEON/kernels/NECol2ImKernel.cpp index b9c7a9ac3b..bb8e758b78 100644 --- a/src/core/NEON/kernels/NECol2ImKernel.cpp +++ b/src/core/NEON/kernels/NECol2ImKernel.cpp @@ -44,6 +44,7 @@ TensorShape get_output_shape(const ITensorInfo *input, const Size2D &convolved_d output_shape.set(0, convolved_dims.width); output_shape.set(1, convolved_dims.height); output_shape.set(2, input->tensor_shape()[0]); + output_shape.set(3, input->tensor_shape()[3]); // For NEON the batch size is on the fourth dimension of the input tensor return output_shape; } diff --git a/src/core/NEON/kernels/NEIm2ColKernel.cpp b/src/core/NEON/kernels/NEIm2ColKernel.cpp index 16525ac22e..61010711a6 100644 --- a/src/core/NEON/kernels/NEIm2ColKernel.cpp +++ b/src/core/NEON/kernels/NEIm2ColKernel.cpp @@ -60,7 +60,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, c } else if(!is_fully_connected) /* Called by ConvolutionLayer */ { - expected_output_shape = misc::shape_calculator::compute_im2col_conv_shape(input, kernel_dims, conv_info, has_bias, dilation); + expected_output_shape = misc::shape_calculator::compute_im2col_conv_shape(input, kernel_dims, conv_info, has_bias, dilation, false); } else /* Called by FullyConnectedLayer */ { |