diff options
| author | Isabella Gottardi <isabella.gottardi@arm.com> | 2018-02-28 14:29:36 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:48:33 +0000 |
| commit | d56e770e7c394d13706a21ee350e7dafe4278987 (patch) | |
| tree | 2f06e9b2857a9020ea2c1d60982112bb2eabda4c /arm_compute/core/Helpers.inl | |
| parent | 847864df46cea578bb0766c17c95ad5e804c49c3 (diff) | |
| download | ComputeLibrary-d56e770e7c394d13706a21ee350e7dafe4278987.tar.gz | |
COMPMID-979: Add NHWC data layout to the tensor's metadata (Part 2)
Change-Id: I24aa35a85834abf0c9954aba714aeae654615b44
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122646
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/core/Helpers.inl')
| -rw-r--r-- | arm_compute/core/Helpers.inl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm_compute/core/Helpers.inl b/arm_compute/core/Helpers.inl index ff85773abb..3db8369f08 100644 --- a/arm_compute/core/Helpers.inl +++ b/arm_compute/core/Helpers.inl @@ -370,9 +370,9 @@ inline int coords2index(const TensorShape &shape, const Coordinates &coord) return index; } -inline int get_data_layout_dimension_index(const ITensorInfo &info, const DataLayoutDimension data_layout_dimension) +inline size_t get_data_layout_dimension_index(const DataLayout data_layout, const DataLayoutDimension data_layout_dimension) { - ARM_COMPUTE_ERROR_ON_MSG(info.data_layout() == DataLayout::UNKNOWN, "Cannot retrieve the dimension index for an unknown layout!"); + ARM_COMPUTE_ERROR_ON_MSG(data_layout == DataLayout::UNKNOWN, "Cannot retrieve the dimension index for an unknown layout!"); /* Return the index based on the data layout * [N C H W] @@ -382,13 +382,13 @@ inline int get_data_layout_dimension_index(const ITensorInfo &info, const DataLa switch(data_layout_dimension) { case DataLayoutDimension::CHANNEL: - return (info.data_layout() == DataLayout::NCHW) ? 2 : 0; + return (data_layout == DataLayout::NCHW) ? 2 : 0; break; case DataLayoutDimension::HEIGHT: - return (info.data_layout() == DataLayout::NCHW) ? 1 : 2; + return (data_layout == DataLayout::NCHW) ? 1 : 2; break; case DataLayoutDimension::WIDTH: - return (info.data_layout() == DataLayout::NCHW) ? 0 : 1; + return (data_layout == DataLayout::NCHW) ? 0 : 1; break; case DataLayoutDimension::BATCHES: return 3; |