diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2018-11-19 13:19:28 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-19 16:14:07 +0000 |
| commit | 8800c00770ed14eb48045cfcf033d6b67595a126 (patch) | |
| tree | 3bdbd3a97bfc21276a98a14aeae3e878c96c3121 /include/armnn/Descriptors.hpp | |
| parent | 5cdda351b4e12c5299173ec6b0fc75a948bdcda0 (diff) | |
| download | armnn-8800c00770ed14eb48045cfcf033d6b67595a126.tar.gz | |
IVGCVSW-2169 Remove DataLayoutIndexed from public API
Change-Id: If8d8087d9d365e467d3ca9bf9c40d7219cb75cfd
Diffstat (limited to 'include/armnn/Descriptors.hpp')
| -rw-r--r-- | include/armnn/Descriptors.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 0abc7583b9..b705abe729 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -198,7 +198,7 @@ struct Pooling2dDescriptor uint32_t m_StrideY; OutputShapeRounding m_OutputShapeRounding; PaddingMethod m_PaddingMethod; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; struct FullyConnectedDescriptor @@ -286,7 +286,7 @@ struct L2NormalizationDescriptor : m_DataLayout(DataLayout::NCHW) {} - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; struct BatchNormalizationDescriptor @@ -297,7 +297,7 @@ struct BatchNormalizationDescriptor {} float m_Eps; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; struct BatchToSpaceNdDescriptor @@ -316,7 +316,7 @@ struct BatchToSpaceNdDescriptor std::vector<unsigned int> m_BlockShape; std::vector<std::pair<unsigned int, unsigned int>> m_Crops; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; struct FakeQuantizationDescriptor @@ -340,7 +340,7 @@ struct ResizeBilinearDescriptor uint32_t m_TargetWidth; uint32_t m_TargetHeight; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; struct ReshapeDescriptor @@ -371,7 +371,7 @@ struct SpaceToBatchNdDescriptor std::vector<unsigned int> m_BlockShape; std::vector<std::pair<unsigned int, unsigned int>> m_PadList; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; // temporary descriptor for Lstm @@ -455,7 +455,7 @@ struct StridedSliceDescriptor int32_t m_EllipsisMask; int32_t m_NewAxisMask; - DataLayoutIndexed m_DataLayout; + DataLayout m_DataLayout; }; } |