From 18ce338711fc3ea44a7731eac795964256beac6c Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Fri, 8 Mar 2019 11:08:30 +0000 Subject: IVGCVSW-2709 Serialize / de-serialize the Splitter layer * fixed typo in Ref Merger Workload comment * fixed typo in ViewsDescriptor comment * made the origins descriptor accessable in the ViewsDescriptor (needed for serialization) * based the unit test on the use of the splitter in the CaffeParser Change-Id: I3e716839adb4eee5a695633377b49e7e18ec2aa9 Signed-off-by: Ferran Balaguer Signed-off-by: Francis Murtagh Signed-off-by: Jim Flynn --- include/armnn/Descriptors.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/armnn/Descriptors.hpp') diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 2cf09746f0..0bbe134e46 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -107,14 +107,13 @@ struct ViewsDescriptor ~ViewsDescriptor(); ViewsDescriptor& operator=(ViewsDescriptor rhs); - /// @Brief Set the view origin coordinates. The arguments are: view, dimension, value. /// If the view is greater than or equal to GetNumViews(), then the view argument is out of range. - /// If the coord is greater than or equal to GetNumViews(), then the coord argument is out of range. + /// If the coord is greater than or equal to GetNumDimensions(), then the coord argument is out of range. Status SetViewOriginCoord(uint32_t view, uint32_t coord, uint32_t value); /// @brief Set the size of the views. The arguments are: view, dimension, value. /// If the view is greater than or equal to GetNumViews(), then the view argument is out of range. - /// If the coord is greater than or equal to GetNumViews(), then the coord argument is out of range. + /// If the coord is greater than or equal to GetNumDimensions(), then the coord argument is out of range. Status SetViewSize(uint32_t view, uint32_t coord, uint32_t value); /// Get the number of views. @@ -125,6 +124,8 @@ struct ViewsDescriptor const uint32_t* GetViewOrigin(uint32_t idx) const; /// Get the view sizes at the int value idx. const uint32_t* GetViewSizes(uint32_t idx) const; + /// Get the View Origins + const OriginsDescriptor& GetOrigins() const; /// Swap the ViewsDescriptor value first and second. friend void swap(ViewsDescriptor& first, ViewsDescriptor& second); -- cgit v1.2.1