diff options
| author | Éanna Ó Catháin <eanna.ocathain@arm.com> | 2018-11-12 17:14:43 +0000 |
|---|---|---|
| committer | Saoirse Stewart Arm <saoirse.stewart@arm.com> | 2018-11-12 21:59:48 +0000 |
| commit | 95807cef855738ca481ace30f32ed9f245a098dd (patch) | |
| tree | 7df7181d6dc19f3db3054614076478af4f417e8a /include/armnn/Descriptors.hpp | |
| parent | 111b5d94d7e854c21377f8d2c0b4234317a903f6 (diff) | |
| download | armnn-95807cef855738ca481ace30f32ed9f245a098dd.tar.gz | |
Tidying up multiple issues
* Fixed error in InferOutputShape implementation
* Added better error checking to the BatchToSpace implementation.
* Added defaults to the batchToSpace descriptors.
* Changed crops to be a vector of pairs to align with the SpaceToBatch implementation
Change-Id: Ib1c16d871f0898a1caeb6629c1fee6380a773e14
Diffstat (limited to 'include/armnn/Descriptors.hpp')
| -rw-r--r-- | include/armnn/Descriptors.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index bda8cf7396..32ac959808 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -299,19 +299,20 @@ struct BatchNormalizationDescriptor struct BatchToSpaceNdDescriptor { BatchToSpaceNdDescriptor() - : m_BlockShape() - , m_Crops() + : m_BlockShape({0, 0}) + , m_Crops({{0, 0}, {0, 0}}) , m_DataLayout(DataLayout::NCHW) {} - BatchToSpaceNdDescriptor(std::vector<unsigned int> blockShape, std::vector<std::vector<unsigned int>> crops) + BatchToSpaceNdDescriptor(std::vector<unsigned int> blockShape, + std::vector<std::pair<unsigned int, unsigned int>> crops) : m_BlockShape(blockShape) , m_Crops(crops) , m_DataLayout(DataLayout::NCHW) {} std::vector<unsigned int> m_BlockShape; - std::vector<std::vector<unsigned int>> m_Crops; + std::vector<std::pair<unsigned int, unsigned int>> m_Crops; DataLayoutIndexed m_DataLayout; }; |