diff options
| author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2021-02-12 17:34:17 +0000 |
|---|---|---|
| committer | Giorgio Arena <giorgio.arena@arm.com> | 2021-02-16 10:12:44 +0000 |
| commit | cab1ab92813a346779bacd728ef8d7d4159abac6 (patch) | |
| tree | 001ea082491c94f2b1c95d324884cbe5a29a0bc9 /src/core/cpu/kernels/CpuPoolingKernel.cpp | |
| parent | f5ac7bf9adeb06663e4ee4527cdf3658e05e6de2 (diff) | |
| download | ComputeLibrary-cab1ab92813a346779bacd728ef8d7d4159abac6.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/cpu/kernels/CpuPoolingKernel.cpp')
| -rw-r--r-- | src/core/cpu/kernels/CpuPoolingKernel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/cpu/kernels/CpuPoolingKernel.cpp b/src/core/cpu/kernels/CpuPoolingKernel.cpp index 21afad2c3f..e159bb40a9 100644 --- a/src/core/cpu/kernels/CpuPoolingKernel.cpp +++ b/src/core/cpu/kernels/CpuPoolingKernel.cpp @@ -356,7 +356,7 @@ std::pair<Status, Window> validate_and_configure_window(ITensorInfo *src, ITenso dst_shape.set(1, pooled_h); TensorInfo dst_info(src->clone()->set_tensor_shape(dst_shape)); win = calculate_max_window(dst_info, Steps(num_elems_processed_per_iteration)); - AccessWindowStatic src_access(src, -pool_pad_left, -pool_pad_top, src_width + border_size.right, src_height + border_size.bottom); + AccessWindowStatic src_access(src, -pool_pad_left, -pool_pad_top, ceil_to_multiple(src_width + border_size.right, pool_size_x), src_height + border_size.bottom); AccessWindowHorizontal dst_access(dst, 0, num_elems_horizontal_window); if(indices) { @@ -368,6 +368,8 @@ std::pair<Status, Window> validate_and_configure_window(ITensorInfo *src, ITenso window_changed = update_window_and_padding(win, src_access, dst_access); } dst_access.set_valid_region(win, ValidRegion(Coordinates(), dst->tensor_shape())); + + border_size = src->padding(); } Status err = (window_changed) ? ARM_COMPUTE_CREATE_ERROR(ErrorCode::RUNTIME_ERROR, "Insufficient Padding!") : Status{}; @@ -529,7 +531,7 @@ void CpuPoolingKernel::run_op(ITensorPack &tensors, const Window &window, const window_src.set(Window::DimZ, Window::Dimension(0, src->info()->dimension(2), pool_stride_y)); } - const auto *uk = get_implementation(src->info()->data_type(), src->info()->data_layout(), _pool_stride_x, _pool_size); + const auto *uk = get_implementation(src->info()->data_type(), _data_layout, _pool_stride_x, _pool_size); ARM_COMPUTE_ERROR_ON(uk == nullptr || uk->ukernel == nullptr); uk->ukernel(src, dst, indices, _pool_info, window_src, window); |