From b566b6e0bf30eb155d44b800454b7ad41e9e7970 Mon Sep 17 00:00:00 2001 From: Anitha Raj Date: Wed, 23 Aug 2023 11:40:06 +0100 Subject: Extend Neon ReshapeLayer validation tests - Add a test case with src and dst having same row size - Remove inline from has_holes() util function Related to COMPMID-6504 Change-Id: Iead1f17692dc57b66c5d9f01eed30169efaee0a5 Signed-off-by: Anitha Raj Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10190 Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- src/core/helpers/Utils.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/core/helpers/Utils.h | 24 +++++------------------- 2 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 src/core/helpers/Utils.cpp (limited to 'src/core') diff --git a/src/core/helpers/Utils.cpp b/src/core/helpers/Utils.cpp new file mode 100644 index 0000000000..3900475355 --- /dev/null +++ b/src/core/helpers/Utils.cpp @@ -0,0 +1,44 @@ +/* +* Copyright (c) 2023 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 "src/core/helpers/Utils.h" + +namespace arm_compute +{ +bool has_holes(const ITensorInfo &info, size_t dimension) +{ + const auto &shape = info.tensor_shape(); + const auto &strides = info.strides_in_bytes(); + size_t squashed_bytes = info.element_size(); + + for(size_t dim = 0; dim <= dimension; ++dim) + { + if(strides[dim] != squashed_bytes) + { + return true; + } + squashed_bytes *= shape[dim]; + } + return false; +} +} // namespace arm_compute diff --git a/src/core/helpers/Utils.h b/src/core/helpers/Utils.h index 641d536c13..7ad960bfa2 100644 --- a/src/core/helpers/Utils.h +++ b/src/core/helpers/Utils.h @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef SRC_CORE_HELPERS_UTILS_H -#define SRC_CORE_HELPERS_UTILS_H +#ifndef ACL_SRC_CORE_HELPERS_UTILS_H +#define ACL_SRC_CORE_HELPERS_UTILS_H #include "arm_compute/core/ITensorInfo.h" + namespace arm_compute { /** Create a strides object based on the provided strides and the tensor dimensions. @@ -100,23 +101,8 @@ inline unsigned int get_next_power_two(unsigned int x) * @note This function checks for holes in all the dimensions upto and including the highest dimension. * */ -inline bool has_holes(const ITensorInfo &info, size_t dimension) -{ - const auto &shape = info.tensor_shape(); - const auto &strides = info.strides_in_bytes(); - size_t squashed_bytes = info.element_size(); - - for(size_t dim = 0; dim <= dimension; ++dim) - { - if(strides[dim] != squashed_bytes) - { - return true; - } - squashed_bytes *= shape[dim]; - } - return false; -} +bool has_holes(const ITensorInfo &info, size_t dimension); } // namespace arm_compute -#endif /* SRC_CORE_HELPERS_UTILS_H */ +#endif // ACL_SRC_CORE_HELPERS_UTILS_H -- cgit v1.2.1