From d17a677a70d477ae508c084148ba6974fc38477d Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Tue, 27 Feb 2018 17:41:55 +0000 Subject: COMPMID-979: Add NHWC data layout to the tensor's metadata Change-Id: I89bdab7dc63a437eb7d60c0ae652c53c3875e503 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122524 Tested-by: Jenkins Reviewed-by: Anthony Barbier Reviewed-by: Pablo Tello --- src/core/TensorInfo.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/core/TensorInfo.cpp') diff --git a/src/core/TensorInfo.cpp b/src/core/TensorInfo.cpp index bd0c85f3d4..2190e3415c 100644 --- a/src/core/TensorInfo.cpp +++ b/src/core/TensorInfo.cpp @@ -34,7 +34,7 @@ using namespace arm_compute; TensorInfo::TensorInfo() : _total_size(0), _fixed_point_position(0), _offset_first_element_in_bytes(0), _strides_in_bytes(), _num_channels(0), _tensor_shape(), _data_type(DataType::UNKNOWN), _format(Format::UNKNOWN), - _is_resizable{ true }, _valid_region{ Coordinates(), _tensor_shape }, _padding{ 0 }, _quantization_info() + _is_resizable{ true }, _valid_region{ Coordinates(), _tensor_shape }, _padding{ 0 }, _quantization_info(), _data_layout(DataLayout::NCHW) { } @@ -53,6 +53,7 @@ TensorInfo::TensorInfo(const ITensorInfo &info) _valid_region = info.valid_region(); _padding = info.padding(); _quantization_info = info.quantization_info(); + _data_layout = info.data_layout(); } TensorInfo::TensorInfo(Format format) @@ -384,6 +385,12 @@ ITensorInfo &TensorInfo::set_quantization_info(const QuantizationInfo &quantizat return *this; } +ITensorInfo &TensorInfo::set_data_layout(const DataLayout &data_layout) +{ + _data_layout = data_layout; + return *this; +} + ITensorInfo &TensorInfo::reset_padding() { _padding = PaddingSize(); -- cgit v1.2.1