From d2d9361a0a338bce478f7d85b4af70d1ed20f26c Mon Sep 17 00:00:00 2001 From: Ramy Elgammal Date: Thu, 22 Dec 2022 15:21:03 +0000 Subject: Add extend padding lock flag - ITensorInfo's padding cannot be extended if its lock_paddings flag is set to True. Resolves: COMPMID-5714 Signed-off-by: Ramy Elgammal Change-Id: I6bca9bbf7172822af60562310578c438b9e15f46 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8875 Tested-by: Arm Jenkins Reviewed-by: SiCong Li Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- src/core/SubTensorInfo.cpp | 18 +++++++++++++++--- src/core/TensorInfo.cpp | 18 ++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/core/SubTensorInfo.cpp b/src/core/SubTensorInfo.cpp index 3d68331181..723b6bc016 100644 --- a/src/core/SubTensorInfo.cpp +++ b/src/core/SubTensorInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -56,12 +56,12 @@ TensorShape extend_parent_shape(TensorShape parent_shape, TensorShape shape, Coo } // namespace SubTensorInfo::SubTensorInfo() - : _parent(nullptr), _tensor_shape(), _dims_state(), _coords(), _valid_region{ Coordinates(), _tensor_shape }, _extend_parent(false) + : _parent(nullptr), _tensor_shape(), _dims_state(), _coords(), _valid_region{ Coordinates(), _tensor_shape }, _extend_parent(false), _lock_paddings(false) { } SubTensorInfo::SubTensorInfo(ITensorInfo *parent, TensorShape tensor_shape, Coordinates coords, bool extend_parent) - : _parent(parent), _tensor_shape(tensor_shape), _dims_state(), _coords(coords), _valid_region{ Coordinates(), _tensor_shape }, _extend_parent(extend_parent) + : _parent(parent), _tensor_shape(tensor_shape), _dims_state(), _coords(coords), _valid_region{ Coordinates(), _tensor_shape }, _extend_parent(extend_parent), _lock_paddings(false) { ARM_COMPUTE_ERROR_ON(parent == nullptr); @@ -114,8 +114,20 @@ ITensorInfo &SubTensorInfo::set_tensor_dims_state(const TensorDimsState &state) return *this; } +ITensorInfo &SubTensorInfo::set_lock_paddings(bool flag) +{ + _lock_paddings = flag; + return *this; +} + +bool SubTensorInfo::lock_paddings() const +{ + return _lock_paddings; +} + bool SubTensorInfo::extend_padding(const PaddingSize &padding) { + ARM_COMPUTE_ERROR_ON(_lock_paddings); ARM_COMPUTE_ERROR_ON(_parent == nullptr); ARM_COMPUTE_ERROR_ON(!_parent->is_resizable()); ARM_COMPUTE_ERROR_ON(_parent->total_size() == 0); diff --git a/src/core/TensorInfo.cpp b/src/core/TensorInfo.cpp index 12f79444c6..954c6c5f1a 100644 --- a/src/core/TensorInfo.cpp +++ b/src/core/TensorInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Arm Limited. + * Copyright (c) 2016-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -35,7 +35,7 @@ namespace arm_compute { TensorInfo::TensorInfo() : _total_size(0), _offset_first_element_in_bytes(0), _strides_in_bytes(), _num_channels(0), _tensor_shape(), _dims_state(), _data_type(DataType::UNKNOWN), _format(Format::UNKNOWN), _is_resizable{ true }, - _valid_region{ Coordinates(), _tensor_shape }, _padding{ 0 }, _quantization_info(), _data_layout(DataLayout::NCHW), _are_values_constant(true), _id(invalid_tensor_id) + _valid_region{ Coordinates(), _tensor_shape }, _padding{ 0 }, _quantization_info(), _data_layout(DataLayout::NCHW), _are_values_constant(true), _id(invalid_tensor_id), _lock_paddings(false) { } @@ -57,6 +57,7 @@ TensorInfo::TensorInfo(const ITensorInfo &info) _data_layout = info.data_layout(); _are_values_constant = info.are_values_constant(); _id = invalid_tensor_id; // Tensor Id has to be explicitly set, instead of being copied + _lock_paddings = info.lock_paddings(); } TensorInfo::TensorInfo(const TensorInfo &info) @@ -77,6 +78,7 @@ TensorInfo::TensorInfo(const TensorInfo &info) _data_layout = info.data_layout(); _are_values_constant = info.are_values_constant(); _id = invalid_tensor_id; // Tensor Id has to be explicitly set, instead of being copied + _lock_paddings = false; } TensorInfo::TensorInfo(Format format) : TensorInfo(TensorShape(), format) @@ -264,8 +266,20 @@ std::tuple TensorInfo::calculate_padding_requirements(c return std::make_tuple(required_strides, required_offset_first_element, required_total_size); } +ITensorInfo &TensorInfo::set_lock_paddings(bool flag) +{ + _lock_paddings = flag; + return *this; +} + +bool TensorInfo::lock_paddings() const +{ + return _lock_paddings; +} + bool TensorInfo::extend_padding(const PaddingSize &padding) { + ARM_COMPUTE_ERROR_ON(_lock_paddings); ARM_COMPUTE_ERROR_ON(!_is_resizable); bool updated = false; -- cgit v1.2.1