diff options
| author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2018-04-11 10:49:04 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 2abb216e1aaeefe65c8a7e6294b4735f0647c927 (patch) | |
| tree | 0e8be3d71e65b41ccae51796c154a2242e55ee2f /tests/Utils.h | |
| parent | a1be5ba07b344794a649510b9bb20968df204f6e (diff) | |
| download | ComputeLibrary-2abb216e1aaeefe65c8a7e6294b4735f0647c927.tar.gz | |
COMPMID-1045 - Fix shape_to_valid_region_gaussian_pyramid_half()
The utility function shape_to_valid_region_gaussian_pyramid_half() did not
calculate correctly the valid regions for levels above 1
Change-Id: Id818efe3b95ce4e0ba1bc57f091d912357a8134a
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/127380
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Sanghoon Lee <sanghoon.lee@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/Utils.h')
| -rw-r--r-- | tests/Utils.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/Utils.h b/tests/Utils.h index f61b94628a..4feed4e491 100644 --- a/tests/Utils.h +++ b/tests/Utils.h @@ -264,8 +264,8 @@ inline ValidRegion shape_to_valid_region_gaussian_pyramid_half(const TensorShape // Compute tensor shape for level "i" of Gaussian Pyramid Half // dst_width = (src_width + 1) * 0.5f // dst_height = (src_height + 1) * 0.5f - shape.set(0, (shape[0] + 1) * 0.5f); - shape.set(1, (shape[1] + 1) * 0.5f); + shape.set(0, (a_shape[0] + 1) * 0.5f); + shape.set(1, (a_shape[1] + 1) * 0.5f); if(border_undefined) { @@ -279,8 +279,8 @@ inline ValidRegion shape_to_valid_region_gaussian_pyramid_half(const TensorShape // 1) If the width/height of the tensor shape is odd, we have to take the ceil value of (a_valid_region.anchor.x() + border_size) / 2.0f or (a_valid_region.anchor.y() + border_size / 2.0f // 2) If the width/height of the tensor shape is even, we have to take the floor value of (a_valid_region.anchor.x() + border_size) / 2.0f or (a_valid_region.anchor.y() + border_size) / 2.0f // In this manner we should be able to propagate correctly the valid region along all levels of the pyramid - invalid_border_left = (shape[0] % 2) ? std::ceil(invalid_border_left) : std::floor(invalid_border_left); - invalid_border_top = (shape[1] % 2) ? std::ceil(invalid_border_top) : std::floor(invalid_border_top); + invalid_border_left = (a_shape[0] % 2) ? std::ceil(invalid_border_left) : std::floor(invalid_border_left); + invalid_border_top = (a_shape[1] % 2) ? std::ceil(invalid_border_top) : std::floor(invalid_border_top); // Set the anchor point anchor.set(0, static_cast<int>(invalid_border_left)); @@ -288,8 +288,8 @@ inline ValidRegion shape_to_valid_region_gaussian_pyramid_half(const TensorShape // Compute shape // Calculate the right and bottom invalid borders at the previous level of the pyramid - const float prev_invalid_border_right = static_cast<float>(shape[0] - (a_valid_region.anchor.x() + a_valid_region.shape[0])); - const float prev_invalid_border_bottom = static_cast<float>(shape[1] - (a_valid_region.anchor.y() + a_valid_region.shape[1])); + const float prev_invalid_border_right = static_cast<float>(a_shape[0] - (a_valid_region.anchor.x() + a_valid_region.shape[0])); + const float prev_invalid_border_bottom = static_cast<float>(a_shape[1] - (a_valid_region.anchor.y() + a_valid_region.shape[1])); // Calculate the right and bottom invalid borders at the current level of the pyramid const float invalid_border_right = std::ceil((prev_invalid_border_right + static_cast<float>(border_size)) / 2.0f); |