diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-02-22 12:00:22 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:48:11 +0000 |
commit | f78625be6890faa8355a73f8a0244257bc90367f (patch) | |
tree | bc5b0b9a7c5311b7cca0582536751b1b6932439f | |
parent | f03561b1dd1b83d44a5c20b0ff349c428efb716c (diff) | |
download | ComputeLibrary-f78625be6890faa8355a73f8a0244257bc90367f.tar.gz |
COMPMID-765: Ignore window for StaticWindow valid region.
Change-Id: I3bcb6047b22d122fac9e7e7267bfcb75f4ebdf33
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121792
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
-rw-r--r-- | src/core/AccessWindowStatic.cpp | 10 | ||||
-rw-r--r-- | tests/datasets/ReshapeLayerDataset.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/core/AccessWindowStatic.cpp b/src/core/AccessWindowStatic.cpp index 2ddd59ed4d..a3a0f28198 100644 --- a/src/core/AccessWindowStatic.cpp +++ b/src/core/AccessWindowStatic.cpp @@ -49,6 +49,8 @@ ValidRegion AccessWindowStatic::compute_valid_region(const Window &window, Valid return input_valid_region; } + ARM_COMPUTE_UNUSED(window); + Coordinates &anchor = input_valid_region.anchor; TensorShape &shape = input_valid_region.shape; @@ -68,14 +70,6 @@ ValidRegion AccessWindowStatic::compute_valid_region(const Window &window, Valid shape.set(1, std::min<int>(_end_y, _info->tensor_shape()[1])); } - // For higher dimension use the intersection of the window size and the - // valid region of the input - for(size_t d = 2; d < _info->num_dimensions(); ++d) - { - anchor.set(d, std::max(window[d].start(), input_valid_region.anchor[d])); - shape.set(d, std::min<int>(window[d].end(), input_valid_region.shape[d]) - anchor[d]); - } - return input_valid_region; } diff --git a/tests/datasets/ReshapeLayerDataset.h b/tests/datasets/ReshapeLayerDataset.h index fa938a63ed..6af65a1c20 100644 --- a/tests/datasets/ReshapeLayerDataset.h +++ b/tests/datasets/ReshapeLayerDataset.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -102,6 +102,7 @@ class SmallReshapeLayerDataset final : public ReshapeLayerDataset public: SmallReshapeLayerDataset() { + add_config(TensorShape(3U), TensorShape(1U, 1U, 3U)); add_config(TensorShape(16U), TensorShape(4U, 2U, 2U)); add_config(TensorShape(2U, 2U, 8U), TensorShape(4U, 8U)); add_config(TensorShape(3U, 3U, 16U), TensorShape(144U)); |