aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Virginas-Tar <Aron.Virginas-Tar@arm.com>2018-11-19 13:06:49 +0000
committerAron Virginas-Tar <aron.virginas-tar@arm.com>2018-11-19 15:18:41 +0000
commitde8b7b3c31f1b15c7ad867d86e14ab27dd022a14 (patch)
treee697a98d45e407c578623a028716565d299df815
parent8599a415c159aa867db12853b3195f0f0a51ee6b (diff)
downloadarmnn-de8b7b3c31f1b15c7ad867d86e14ab27dd022a14.tar.gz
IVGCVSW-2168: Remove DataLayout from Layer
Change-Id: Iab6ad04e5c786e4e639578f7b1d1537dd1196e2f
-rw-r--r--src/armnn/Layer.cpp1
-rw-r--r--src/armnn/Layer.hpp3
-rw-r--r--src/armnn/layers/LayerWithParameters.hpp11
3 files changed, 0 insertions, 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<OutputSlot> 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
@@ -28,17 +28,6 @@ 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,
const Parameters& param,
const char* name)
: Layer(numInputSlots, numOutputSlots, type, name)