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/backends/backendsCommon/DataLayoutIndexed.hpp | 51 ----------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/backends/backendsCommon/DataLayoutIndexed.hpp (limited to 'src/backends/backendsCommon/DataLayoutIndexed.hpp') diff --git a/src/backends/backendsCommon/DataLayoutIndexed.hpp b/src/backends/backendsCommon/DataLayoutIndexed.hpp deleted file mode 100644 index 8547475706..0000000000 --- a/src/backends/backendsCommon/DataLayoutIndexed.hpp +++ /dev/null @@ -1,51 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once -#include - -namespace armnn -{ - -// Provides access to the appropriate indexes for Channels, Height and Width based on DataLayout -class DataLayoutIndexed -{ -public: - DataLayoutIndexed(DataLayout dataLayout) : m_DataLayout(dataLayout) - { - switch (dataLayout) - { - case DataLayout::NHWC: - m_ChannelsIndex = 3; - m_HeightIndex = 1; - m_WidthIndex = 2; - break; - case DataLayout::NCHW: - m_ChannelsIndex = 1; - m_HeightIndex = 2; - m_WidthIndex = 3; - break; - default: - throw InvalidArgumentException("Unknown DataLayout value: " + - std::to_string(static_cast(dataLayout))); - } - } - - DataLayout GetDataLayout() const { return m_DataLayout; } - unsigned int GetChannelsIndex() const { return m_ChannelsIndex; } - unsigned int GetHeightIndex() const { return m_HeightIndex; } - unsigned int GetWidthIndex() const { return m_WidthIndex; } - -private: - DataLayout m_DataLayout; - unsigned int m_ChannelsIndex; - unsigned int m_HeightIndex; - unsigned int m_WidthIndex; -}; - -// Equality methods -bool operator==(const DataLayout& dataLayout, const DataLayoutIndexed& indexed); -bool operator==(const DataLayoutIndexed& indexed, const DataLayout& dataLayout); - -} -- cgit v1.2.1