diff options
author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2021-02-12 17:34:17 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-02-15 19:35:58 +0000 |
commit | bae22373a71ccf9b4c008e62f081344a929ffb24 (patch) | |
tree | 0bb5a39795656b4f2d14c959b8d7b3d7caa92ab3 /src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp | |
parent | 65d04488b6eefa5f9b4bf752a8134b987086e57e (diff) | |
download | ComputeLibrary-bae22373a71ccf9b4c008e62f081344a929ffb24.tar.gz |
Fix data layout retention and handling of leftovers when there is no padding
Resolves COMPMID-4258
Change-Id: I8782bf725cd0d376d538021406eb1f5be962b2cb
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/298627
Reviewed-by: Teresa Charlin Reyes <teresa.charlinreyes@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Teresa Charlin Reyes <teresa.charlinreyes@arm.com>
Tested-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5082
Reviewed-by: TeresaARM <teresa.charlinreyes@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp')
-rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp b/src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp index fa06a0078b..5979862ed8 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp +++ b/src/core/NEON/kernels/arm_conv/pooling/pooling_depthfirst_generic.hpp @@ -191,6 +191,13 @@ class PoolingDepthfirstGeneric : public PoolingCommon<typename strategy::operand const auto pad_bottom = static_cast<unsigned int>(std::max<int>(end_in_i - height, 0)); const auto valid_rows = input_rows() - pad_top - pad_bottom; + // Compute the number of pooling window rows which are contained in + // either the valid region of the input tensor, or the padding. + const auto padded_bottom = std::min<unsigned int>( + start_in_i + m_args.pool_window.rows, height + padding.bottom + ); + const auto n_total_rows = padded_bottom - start_in_i; + auto outptr_col = outptr_row; auto inptr_row = inptr_batch + (start_in_i + pad_top) * ld_input_row; @@ -205,6 +212,13 @@ class PoolingDepthfirstGeneric : public PoolingCommon<typename strategy::operand const auto pad_right = static_cast<unsigned int>(std::max<int>(0, end_in_j - width)); const auto valid_cols = input_cols() - pad_left - pad_right; + // Compute the number of pooling window columns which are contained + // in either the valid region of the input tensor, or the padding. + const auto padded_right = std::min<unsigned int>( + start_in_j + m_args.pool_window.cols, width + padding.right + ); + const auto n_total_cols = padded_right - start_in_j; + // Construct the input pointer array - fill in all valid points // contiguously. const TInput **ptrs = inptr_array; @@ -222,7 +236,8 @@ class PoolingDepthfirstGeneric : public PoolingCommon<typename strategy::operand // Compute the number of valid cells const auto valid_cells = valid_rows * valid_cols; - const auto window_cells = m_args.exclude_padding ? valid_cells : input_rows() * input_cols(); + const auto cells_in_range = n_total_rows * n_total_cols; + const auto window_cells = m_args.exclude_padding ? valid_cells : cells_in_range; // Get the output pointer for this call TOutput *outptr = outptr_col; |