From 247f52cfe337f7b2542b900e3d8cf122e9d4f11c Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Thu, 22 Mar 2018 11:24:56 +0000 Subject: COMPMID-1013 - Create WinogradInfo data structure COMPMID-1014 - Refactoring Winograd's dataset Change-Id: I6abdcbf9a90d663f4db666cd410afece9f1d034d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125899 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/datasets/WinogradInputTransformDataset.h | 57 +++++++++++--------------- 1 file changed, 23 insertions(+), 34 deletions(-) (limited to 'tests/datasets/WinogradInputTransformDataset.h') diff --git a/tests/datasets/WinogradInputTransformDataset.h b/tests/datasets/WinogradInputTransformDataset.h index 07e41ebf7a..625daa0e6e 100644 --- a/tests/datasets/WinogradInputTransformDataset.h +++ b/tests/datasets/WinogradInputTransformDataset.h @@ -37,13 +37,12 @@ namespace datasets class WinogradInputTransformDataset { public: - using type = std::tuple; + using type = std::tuple; struct iterator { - iterator(std::vector::const_iterator in_it, std::vector::const_iterator info_it, std::vector::const_iterator kernel_dims_it, - std::vector::const_iterator format_it) - : _in_it{ std::move(in_it) }, _info_it{ std::move(info_it) }, _kernel_dims_it{ std::move(kernel_dims_it) }, _format_it{ std::move(format_it) } + iterator(std::vector::const_iterator in_it, std::vector::const_iterator info_it) + : _in_it{ std::move(in_it) }, _info_it{ std::move(info_it) } { } @@ -51,50 +50,42 @@ public: { std::stringstream description; description << "In=" << *_in_it << ":"; - description << "Info=" << *_info_it; - description << "KernelDims=" << *_kernel_dims_it; - description << "IsNCHW=" << *_format_it; + description << "WinogradInfo=" << *_info_it; return description.str(); } WinogradInputTransformDataset::type operator*() const { - return std::make_tuple(*_in_it, *_info_it, *_kernel_dims_it, *_format_it); + return std::make_tuple(*_in_it, *_info_it); } iterator &operator++() { ++_in_it; ++_info_it; - ++_kernel_dims_it; - ++_format_it; return *this; } private: - std::vector::const_iterator _in_it; - std::vector::const_iterator _info_it; - std::vector::const_iterator _kernel_dims_it; - std::vector::const_iterator _format_it; + std::vector::const_iterator _in_it; + std::vector::const_iterator _info_it; }; iterator begin() const { - return iterator(_in_shapes.begin(), _infos.begin(), _kernel_dims.begin(), _format.begin()); + return iterator(_in_shapes.begin(), _infos.begin()); } int size() const { - return std::min(_in_shapes.size(), std::min(_infos.size(), std::min(_kernel_dims.size(), _format.size()))); + return std::min(_in_shapes.size(), _infos.size()); } - void add_config(TensorShape in, PadStrideInfo info, Size2D kernel_dims, bool format) + void add_config(TensorShape in, WinogradInfo info) { _in_shapes.emplace_back(std::move(in)); _infos.emplace_back(std::move(info)); - _kernel_dims.emplace_back(std::move(kernel_dims)); - _format.emplace_back(std::move(format)); } protected: @@ -102,10 +93,8 @@ protected: WinogradInputTransformDataset(WinogradInputTransformDataset &&) = default; private: - std::vector _in_shapes{}; - std::vector _infos{}; - std::vector _kernel_dims{}; - std::vector _format{}; + std::vector _in_shapes{}; + std::vector _infos{}; }; class SmallWinogradInputTransformDataset final : public WinogradInputTransformDataset @@ -113,13 +102,13 @@ class SmallWinogradInputTransformDataset final : public WinogradInputTransformDa public: SmallWinogradInputTransformDataset() { - add_config(TensorShape(9U, 9U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); - add_config(TensorShape(27U, 13U, 2U), PadStrideInfo(1, 1, 0, 0), Size2D(3U, 3U), true); - add_config(TensorShape(128U, 64U, 1U, 3U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); - add_config(TensorShape(9U, 9U, 3U, 4U), PadStrideInfo(1, 1, 0, 0), Size2D(3U, 3U), true); - add_config(TensorShape(27U, 13U, 2U, 4U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); - add_config(TensorShape(9U, 9U, 3U, 5U), PadStrideInfo(1, 1, 0, 0), Size2D(3U, 3U), true); - add_config(TensorShape(14U, 14U, 512U, 2U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); + add_config(TensorShape(9U, 9U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(9U, 9U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); + add_config(TensorShape(27U, 13U, 2U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(27U, 13U), PadStrideInfo(1, 1, 0, 0), DataLayout::NCHW)); + add_config(TensorShape(128U, 64U, 1U, 3U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(128U, 64U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); + add_config(TensorShape(9U, 9U, 3U, 4U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(9U, 9U), PadStrideInfo(1, 1, 0, 0), DataLayout::NCHW)); + add_config(TensorShape(27U, 13U, 2U, 4U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(27U, 13U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); + add_config(TensorShape(9U, 9U, 3U, 5U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(9U, 9U), PadStrideInfo(1, 1, 0, 0), DataLayout::NCHW)); + add_config(TensorShape(14U, 14U, 512U, 2U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(14U, 14U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); } }; @@ -128,10 +117,10 @@ class LargeWinogradInputTransformDataset final : public WinogradInputTransformDa public: LargeWinogradInputTransformDataset() { - add_config(TensorShape(42U, 37U, 8U, 15U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); - add_config(TensorShape(57U, 60U, 13U, 8U), PadStrideInfo(1, 1, 1, 1), Size2D(3U, 3U), true); - add_config(TensorShape(128U, 64U, 21U, 13U), PadStrideInfo(1, 1, 0, 0), Size2D(3U, 3U), true); - add_config(TensorShape(83U, 72U, 14U, 5U), PadStrideInfo(1, 1, 0, 0), Size2D(3U, 3U), true); + add_config(TensorShape(42U, 37U, 8U, 15U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(42U, 37U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); + add_config(TensorShape(57U, 60U, 13U, 8U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(57U, 60U), PadStrideInfo(1, 1, 1, 1), DataLayout::NCHW)); + add_config(TensorShape(128U, 64U, 21U, 13U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(128U, 64U), PadStrideInfo(1, 1, 0, 0), DataLayout::NCHW)); + add_config(TensorShape(83U, 72U, 14U, 5U), WinogradInfo(Size2D(2U, 2U), Size2D(3U, 3U), Size2D(83U, 72U), PadStrideInfo(1, 1, 0, 0), DataLayout::NCHW)); } }; } // namespace datasets -- cgit v1.2.1