diff options
| author | SiCong Li <sicong.li@arm.com> | 2017-06-28 15:27:02 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | 7a0357549a0ffa0ea3ea56fa791a15a35368afe8 (patch) | |
| tree | 8f9c9d87f8199d69068ff769cc2136f7407363eb /tests/validation/TensorOperations.h | |
| parent | 4e288696a2ca8e1c9d6d37d90d237c1a18d6e364 (diff) | |
| download | ComputeLibrary-7a0357549a0ffa0ea3ea56fa791a15a35368afe8.tar.gz | |
COMPMID-424 Clean up validation tests for 2D spatial filter functions
* Remove shape_to_valid_region_undefined_border
* Remove hardcoded border size
Change-Id: I3c64148d8f7ce7e960f21d88d3af43bb23501683
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79106
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/validation/TensorOperations.h')
| -rw-r--r-- | tests/validation/TensorOperations.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h index 843c52fec4..5557cfc2df 100644 --- a/tests/validation/TensorOperations.h +++ b/tests/validation/TensorOperations.h @@ -716,7 +716,7 @@ template <typename T> void non_linear_filter(const Tensor<T> &in, Tensor<T> &out, NonLinearFilterFunction function, unsigned int mask_size, MatrixPattern pattern, const uint8_t *mask, BorderMode border_mode, uint8_t constant_border_value) { - ARM_COMPUTE_ERROR_ON(MatrixPattern::OTHER == pattern && nullptr == mask); + ARM_COMPUTE_ERROR_ON(pattern == MatrixPattern::OTHER && mask == nullptr); using intermediate_type = typename common_promoted_signed_type<T>::intermediate_type; @@ -725,11 +725,7 @@ void non_linear_filter(const Tensor<T> &in, Tensor<T> &out, NonLinearFilterFunct std::vector<intermediate_type> vals(sq_mask_size); intermediate_type current_value = 0; - ValidRegion valid_region = shape_to_valid_region(in.shape()); - if(border_mode == BorderMode::UNDEFINED) - { - valid_region = shape_to_valid_region_undefined_border(in.shape(), BorderSize(half_mask_size)); - } + const ValidRegion valid_region = shape_to_valid_region(in.shape(), border_mode == BorderMode::UNDEFINED, BorderSize(half_mask_size)); for(int element_idx = 0, count = 0, index = 0; element_idx < in.num_elements(); ++element_idx, count = 0, index = 0) { |