From de8b7b3c31f1b15c7ad867d86e14ab27dd022a14 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Mon, 19 Nov 2018 13:06:49 +0000 Subject: IVGCVSW-2168: Remove DataLayout from Layer Change-Id: Iab6ad04e5c786e4e639578f7b1d1537dd1196e2f --- src/armnn/Layer.cpp | 1 - src/armnn/Layer.hpp | 3 --- src/armnn/layers/LayerWithParameters.hpp | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index c8c39f1cad..cf825e39fd 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.cpp @@ -132,7 +132,6 @@ Layer::Layer(unsigned int numInputSlots, : m_OutputHandlers(numOutputSlots) , m_LayerName(name ? name : "") , m_Type(type) -, m_DataLayout(layout) , m_BackendId(UninitializedBackendId()) , m_Guid(GenerateLayerGuid()) { diff --git a/src/armnn/Layer.hpp b/src/armnn/Layer.hpp index 8d660ed6e0..51c6c09563 100644 --- a/src/armnn/Layer.hpp +++ b/src/armnn/Layer.hpp @@ -235,8 +235,6 @@ public: DataType GetDataType() const; - DataLayout GetDataLayout() const { return m_DataLayout; } - const BackendId& GetBackendId() const { return m_BackendId; } void SetBackendId(const BackendId& id) { m_BackendId = id; } @@ -344,7 +342,6 @@ private: std::vector m_OutputSlots; const LayerType m_Type; - const DataLayout m_DataLayout; BackendId m_BackendId; /// Used for sorting. diff --git a/src/armnn/layers/LayerWithParameters.hpp b/src/armnn/layers/LayerWithParameters.hpp index 6156d6b66c..ba43d6f88d 100644 --- a/src/armnn/layers/LayerWithParameters.hpp +++ b/src/armnn/layers/LayerWithParameters.hpp @@ -25,17 +25,6 @@ public: } protected: - LayerWithParameters(unsigned int numInputSlots, - unsigned int numOutputSlots, - LayerType type, - DataLayout layout, - const Parameters& param, - const char* name) - : Layer(numInputSlots, numOutputSlots, type, layout, name) - , m_Param(param) - { - } - LayerWithParameters(unsigned int numInputSlots, unsigned int numOutputSlots, LayerType type, -- cgit v1.2.1