From 2135015779092e259ad5d5df185eda0c34b56359 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Wed, 28 Nov 2018 16:22:22 +0000 Subject: IVGCVSW-2264 Move DataLayoutIndexed to armnnUtils * Since DataLayoutIndexed is now required in the TF parser, this changes move it to the armnnUtils library so that it'll be accessible by the armnnTfParser * Modified CMake files and Android.mk files accordingly Change-Id: Ie2620359ef288aeff64cb9e9bec068a466eee0e9 --- src/armnnUtils/DataLayoutIndexed.cpp | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/armnnUtils/DataLayoutIndexed.cpp (limited to 'src/armnnUtils/DataLayoutIndexed.cpp') diff --git a/src/armnnUtils/DataLayoutIndexed.cpp b/src/armnnUtils/DataLayoutIndexed.cpp new file mode 100644 index 0000000000..db27de4bdd --- /dev/null +++ b/src/armnnUtils/DataLayoutIndexed.cpp @@ -0,0 +1,46 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "DataLayoutIndexed.hpp" + +using namespace armnn; + +namespace armnnUtils +{ + +DataLayoutIndexed::DataLayoutIndexed(armnn::DataLayout dataLayout) + : m_DataLayout(dataLayout) +{ + switch (dataLayout) + { + case armnn::DataLayout::NHWC: + m_ChannelsIndex = 3; + m_HeightIndex = 1; + m_WidthIndex = 2; + break; + case armnn::DataLayout::NCHW: + m_ChannelsIndex = 1; + m_HeightIndex = 2; + m_WidthIndex = 3; + break; + default: + throw armnn::InvalidArgumentException("Unknown DataLayout value: " + + std::to_string(static_cast(dataLayout))); + } +} + +// Definition in include/armnn/Types.hpp +bool operator==(const DataLayout& dataLayout, const DataLayoutIndexed& indexed) +{ + return dataLayout == indexed.GetDataLayout(); +} + +// Definition in include/armnn/Types.hpp +bool operator==(const DataLayoutIndexed& indexed, const DataLayout& dataLayout) +{ + return indexed.GetDataLayout() == dataLayout; +} + +} // namespace armnnUtils -- cgit v1.2.1