diff options
author | Mike Kelly <mike.kelly@arm.com> | 2023-10-11 14:25:50 +0100 |
---|---|---|
committer | mike.kelly <mike.kelly@arm.com> | 2023-10-12 11:57:55 +0000 |
commit | 363b572b61f7a32e92cde51478d7556ce43db56f (patch) | |
tree | c4f888c607acab8d8e683b77bb20f7c2e507c558 /src/armnn/Descriptors.cpp | |
parent | c4a932a5f2f8b5f8b684ed2034768136493fc64b (diff) | |
download | armnn-363b572b61f7a32e92cde51478d7556ce43db56f.tar.gz |
Revert "Revert "MLCE-1093 Reshape and concat invalid results""
This reverts commit 008270f8c1359a7d62c2f881326b4d3f0d8b7b56.
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: If8f5151aa349ff3834f03391e813669e5c51ed66
Diffstat (limited to 'src/armnn/Descriptors.cpp')
-rw-r--r-- | src/armnn/Descriptors.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp index e6374aea8f..5e4628bd77 100644 --- a/src/armnn/Descriptors.cpp +++ b/src/armnn/Descriptors.cpp @@ -216,12 +216,16 @@ void OriginsDescriptor::ReorderOrigins(unsigned int* newOrdering, unsigned int ViewsDescriptor::ViewsDescriptor() : m_Origins() , m_ViewSizes(nullptr) +, m_IsAxisSet(false) +, m_Axis(0) {} ViewsDescriptor::ViewsDescriptor(uint32_t numViews, uint32_t numDimensions /*= 4*/) : m_Origins(numViews, numDimensions) , m_ViewSizes(numViews > 0 && numDimensions > 0 ? new uint32_t *[numViews]() : nullptr) + , m_IsAxisSet(false) + , m_Axis(0) { if (m_ViewSizes) { @@ -236,6 +240,8 @@ ViewsDescriptor::ViewsDescriptor(const ViewsDescriptor& other) : m_Origins(other.m_Origins) , m_ViewSizes(other.GetNumViews() > 0 && other.GetNumDimensions() > 0 ? new uint32_t *[other.GetNumViews()]() : nullptr) + , m_IsAxisSet(other.m_IsAxisSet) + , m_Axis(other.m_Axis) { if (m_ViewSizes) { @@ -361,6 +367,8 @@ void swap(ViewsDescriptor& first, ViewsDescriptor& second) using std::swap; swap(first.m_Origins, second.m_Origins); swap(first.m_ViewSizes, second.m_ViewSizes); + swap(first.m_IsAxisSet, second.m_IsAxisSet); + swap(first.m_Axis, second.m_Axis); } void ViewsDescriptor::SetAxis(int32_t axis) |