From c79519648b9e908c26cefc436a3c34b83f36403c Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 12 Dec 2017 17:58:11 +0000 Subject: COMPMID-556: Move Convolution to reference folder Change-Id: I5e7f2d9390b45be252d5f692b47f88472b681d14 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/112993 Reviewed-by: Anthony Barbier Tested-by: Anthony Barbier --- tests/validation/CPP/Convolution.cpp | 70 ------------------------------------ tests/validation/CPP/Convolution.h | 43 ---------------------- 2 files changed, 113 deletions(-) delete mode 100644 tests/validation/CPP/Convolution.cpp delete mode 100644 tests/validation/CPP/Convolution.h (limited to 'tests/validation/CPP') diff --git a/tests/validation/CPP/Convolution.cpp b/tests/validation/CPP/Convolution.cpp deleted file mode 100644 index 84be858cfc..0000000000 --- a/tests/validation/CPP/Convolution.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/Helpers.h" - -#include "Convolution.h" -#include "Utils.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -template -SimpleTensor convolution(const SimpleTensor &src, const int16_t *conv, uint32_t scale, BorderMode border_mode, T constant_border_value, const unsigned int filter_size) -{ - SimpleTensor dst(src.shape(), src.data_type()); - SimpleTensor sum(src.shape(), src.data_type()); - - for(int element_idx = 0; element_idx < src.num_elements(); ++element_idx) - { - const Coordinates id = index2coord(src.shape(), element_idx); - apply_2d_spatial_filter(id, src, sum, TensorShape(filter_size, filter_size), conv, 1, border_mode, constant_border_value); - - if(tensor_elem_at(sum, id, border_mode, constant_border_value) < 0) - { - dst[element_idx] = 0; - } - else if((tensor_elem_at(sum, id, border_mode, constant_border_value) / scale) > 255) - { - dst[element_idx] = 255; - } - else - { - dst[element_idx] = tensor_elem_at(sum, id, border_mode, constant_border_value) / scale; - } - } - - return dst; -} - -template SimpleTensor convolution(const SimpleTensor &src, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value, - const unsigned int filter_size); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/CPP/Convolution.h b/tests/validation/CPP/Convolution.h deleted file mode 100644 index bdaac28ae6..0000000000 --- a/tests/validation/CPP/Convolution.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef __ARM_COMPUTE_TEST_CONVOLUTION_H__ -#define __ARM_COMPUTE_TEST_CONVOLUTION_H__ - -#include "tests/SimpleTensor.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -template -SimpleTensor convolution(const SimpleTensor &src, const int16_t *conv, uint32_t scale, BorderMode border_mode, T constant_border_value, const unsigned int filter_size); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_CONVOLUTION_H__ */ -- cgit v1.2.1