diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2021-04-16 12:41:45 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-04-20 13:32:10 +0000 |
| commit | dcf4c87cf78a5f1667699c1a3511d09356938660 (patch) | |
| tree | 28aa191a226e4bf4350d622fcb668abaa17e8677 /arm_compute/core/utils | |
| parent | 562bee584f3633167725af7915f50d07b0597f10 (diff) | |
| download | ComputeLibrary-dcf4c87cf78a5f1667699c1a3511d09356938660.tar.gz | |
CLDepthwiseConvolutionLayer rework - Part 1
Remove the reshaped variant for CLDepthwiseConvolutionLayer 3x3 NHWC Quantized
- Remove kernel selection by GPUTarget
- Remove unused quantized support from the NHWC kernel
- Remove CLDepthwiseConvolutionLayerReshapeWeightsKernel
- Remove OpenCL kernels for reshaped dwc 3x3 quantized and weights reshape
- Remove the "_bifrost" suffix in common OpenCL kernel
- Remove the ICLDepthwiseConvolutionLayer3x3Kernel common interface
Resolve COMPMID-3864, COMPMID-3907
Change-Id: Icfac0fb6c00e214985beb05dad7c0cdbbee7d830
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5447
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/core/utils')
| -rw-r--r-- | arm_compute/core/utils/misc/ShapeCalculator.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index ba37f9a61e..8e49c068af 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -287,30 +287,6 @@ inline TensorShape compute_interleaved_shape(const ITensorInfo &a, int mult_inte return shape_interleaved_a; } -/** Calculate the reshaped shape of the weights to use in depthwise convolution - * - * @param[in] input Input tensor info - * @param[in] info Depthwise convolution information to be used for reshaping. - * - * @return the calculated shape - */ -inline TensorShape compute_reshaped_depthwise_weights_shape(const ITensorInfo &input, const DepthwiseConvolutionReshapeInfo &info) -{ - const auto data_layout = input.data_layout(); - TensorShape weights_shape{}; - - const int width_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); - const int height_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); - const int channel_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL); - const size_t num_channels = input.dimension(channel_idx); - const size_t num_rows = input.dimension(height_idx); - const size_t num_cols = input.dimension(width_idx); - - weights_shape.set(0, num_rows * num_cols * info.c0); - weights_shape.set(1, DIV_CEIL(num_channels, info.c0)); - return weights_shape; -} - /** Calculate the transposed 1xW shape * * @param[in] b Input tensor info |