aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Monahan <david.monahan@arm.com>2020-05-30 09:48:39 +0100
committerDavid Monahan <david.monahan@arm.com>2020-05-30 11:35:48 +0100
commit4a0c9b99deb88a0ec5de7997f09062686915c6cc (patch)
tree0456d14c0222c9a70ee1ba41f8b0ce384f4f25ad /include
parentf540eb8111ce5d241111da487be7d817661e29b4 (diff)
downloadarmnn-4a0c9b99deb88a0ec5de7997f09062686915c6cc.tar.gz
IVGCVSW-4888 Update Resize Front end for new parameters
* Added AlignCorners and HalfPixelCenters to Resize and ResizeBilinear * Updated Serializer and Serializer tests !android-nn-driver:3280 Signed-off-by: David Monahan <david.monahan@arm.com> Change-Id: Ice3bb448c239b04323854641525bfe0808c03b2e
Diffstat (limited to 'include')
-rw-r--r--include/armnn/Descriptors.hpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index 13765e8db3..9e5dea2fea 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -718,6 +718,8 @@ struct ResizeBilinearDescriptor
: m_TargetWidth(0)
, m_TargetHeight(0)
, m_DataLayout(DataLayout::NCHW)
+ , m_AlignCorners(false)
+ , m_HalfPixelCenters(false)
{}
/// Target width value.
@@ -726,6 +728,10 @@ struct ResizeBilinearDescriptor
uint32_t m_TargetHeight;
/// The data layout to be used (NCHW, NHWC).
DataLayout m_DataLayout;
+ /// Aligned corners
+ bool m_AlignCorners;
+ /// Half Pixel Centers
+ bool m_HalfPixelCenters;
};
/// A ResizeDescriptor for the ResizeLayer.
@@ -736,7 +742,7 @@ struct ResizeDescriptor
, m_TargetHeight(0)
, m_Method(ResizeMethod::NearestNeighbor)
, m_DataLayout(DataLayout::NCHW)
- , m_BilinearAlignCorners(false)
+ , m_AlignCorners(false)
, m_HalfPixelCenters(false)
{}
@@ -746,7 +752,7 @@ struct ResizeDescriptor
m_TargetHeight == rhs.m_TargetHeight &&
m_Method == rhs.m_Method &&
m_DataLayout == rhs.m_DataLayout &&
- m_BilinearAlignCorners == rhs.m_BilinearAlignCorners &&
+ m_AlignCorners == rhs.m_AlignCorners &&
m_HalfPixelCenters == rhs.m_HalfPixelCenters;
}
@@ -759,8 +765,8 @@ struct ResizeDescriptor
ResizeMethod m_Method;
/// The data layout to be used (NCHW, NHWC).
DataLayout m_DataLayout;
- /// Aligned corners for bilinear method
- bool m_BilinearAlignCorners;
+ /// Aligned corners
+ bool m_AlignCorners;
/// Half Pixel Centers
bool m_HalfPixelCenters;
};