diff options
| author | Adnan AlSinan <adnan.alsinan@arm.com> | 2023-02-22 12:15:14 +0000 |
|---|---|---|
| committer | Adnan AlSinan <adnan.alsinan@arm.com> | 2023-03-01 11:48:22 +0000 |
| commit | bbf2e7477be984702e1a51f2a23910ee8349b867 (patch) | |
| tree | d5ce7a16e7f6e977bba2f88c8a913d071b4e04ed /tests/validation/reference | |
| parent | 227db8db83cd85d8704a8edbd4e8c88af0dd1f84 (diff) | |
| download | ComputeLibrary-bbf2e7477be984702e1a51f2a23910ee8349b867.tar.gz | |
Add support for kernel indices in Maxpool
- Add a max pooling implementation that returns kernel indices.
- Add a parameter in pooling info object to pick kernel indices impl.
- Add validation tests.
Resolves: [ONCPUML-1187]
Signed-off-by: Adnan AlSinan <adnan.alsinan@arm.com>
Change-Id: I485ef1604f676ee14d5f7f62d33699e49c38e4d3
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9192
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/reference')
| -rw-r--r-- | tests/validation/reference/PoolingLayer.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/validation/reference/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp index 6a358ced0c..bf7bd0c1df 100644 --- a/tests/validation/reference/PoolingLayer.cpp +++ b/tests/validation/reference/PoolingLayer.cpp @@ -83,20 +83,28 @@ SimpleTensor<T> pooling_layer_internal(const SimpleTensor<T> &src, const Pooling { int wstart = w * pool_stride_x - pad_left; int hstart = h * pool_stride_y - pad_top; + + // Used to calculate kernel indices + int kh_start = std::max(0, -hstart); + int kw_start = std::max(0, -wstart); + int max_ker_index{ 0 }; + int wend = std::min(wstart + pool_size_x, w_src); int hend = std::min(hstart + pool_size_y, h_src); wstart = std::max(wstart, 0); hstart = std::max(hstart, 0); auto max_val = info.use_inf_as_limit ? -std::numeric_limits<ACC_T>::infinity() : std::numeric_limits<ACC_T>::lowest(); int max_index{ 0 }; - for(int y = hstart; y < hend; ++y) + + for(int y = hstart, kh = kh_start; y < hend; ++y, ++kh) { - for(int x = wstart; x < wend; ++x) + for(int x = wstart, kw = kw_start; x < wend; ++x, ++kw) { const auto val = static_cast<ACC_T>(src[b * z_src * h_src * w_src + r * h_src * w_src + y * w_src + x]); if(val > max_val) { - max_val = val; + max_val = val; + max_ker_index = pool_size_x * (kh) + (kw); if(data_layout == DataLayout::NCHW) { max_index = coord2index(src.shape(), Coordinates(x, y, r, 0)); @@ -112,7 +120,7 @@ SimpleTensor<T> pooling_layer_internal(const SimpleTensor<T> &src, const Pooling dst[b * z_dst * h_dst * w_dst + r * h_dst * w_dst + h * w_dst + w] = static_cast<T>(max_val); if(indices) { - (*indices)[b * z_dst * h_dst * w_dst + r * h_dst * w_dst + h * w_dst + w] = max_index; + (*indices)[b * z_dst * h_dst * w_dst + r * h_dst * w_dst + h * w_dst + w] = (info.use_kernel_indices) ? max_ker_index : max_index; } } } |