diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2018-07-04 17:03:33 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:10 +0000 |
commit | 149fdf3cad6b42ed302ebe2b0d614a36b9b4d81c (patch) | |
tree | 8eee21e55cf4e6148da5825ccaf2811ef742cfcc /tests/validation | |
parent | 876be2a0d11874d871860dbd22481f831d6878f6 (diff) | |
download | ComputeLibrary-149fdf3cad6b42ed302ebe2b0d614a36b9b4d81c.tar.gz |
COMPMID-1337 Implementing Winograd Convolution Layer 1x3 and 3x1 kernels on OpenCL NHWC
Change-Id: Ia07e0dfcbcd07366c4bcb956e298369fb12a0369
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/138759
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'tests/validation')
-rw-r--r-- | tests/validation/CL/Winograd.cpp | 8 | ||||
-rw-r--r-- | tests/validation/reference/Winograd.cpp | 14 |
2 files changed, 6 insertions, 16 deletions
diff --git a/tests/validation/CL/Winograd.cpp b/tests/validation/CL/Winograd.cpp index 849d0c13bc..c39cb4e790 100644 --- a/tests/validation/CL/Winograd.cpp +++ b/tests/validation/CL/Winograd.cpp @@ -70,7 +70,9 @@ const auto SmallWinogradInputTransformDatasetNCHW = datasets::SmallWinogradInputTransformDataset1x4_1x5())))))))); const auto SmallWinogradInputTransformDatasetNHWC = framework::dataset::concat(datasets::SmallWinogradInputTransformDataset4x4_3x3(), - datasets::SmallWinogradInputTransformDataset4x4_5x5()); + framework::dataset::concat(datasets::SmallWinogradInputTransformDataset4x1_3x1(), + framework::dataset::concat(datasets::SmallWinogradInputTransformDataset1x4_1x3(), + datasets::SmallWinogradInputTransformDataset4x4_5x5()))); const auto LargeWinogradInputTransformDatasetNCHW = framework::dataset::concat(datasets::LargeWinogradInputTransformDataset2x2_3x3(), @@ -98,7 +100,9 @@ const auto SmallWinogradFilterTransformDatasetNCHW = const auto SmallWinogradFilterTransformDatasetNHWC = framework::dataset::concat(combine(datasets::Small3x3Shapes(), framework::dataset::make("OutputTile", { Size2D(4U, 4U) })), - combine(datasets::Small5x5Shapes(), framework::dataset::make("OutputTile", { Size2D(4U, 4U) }))); + framework::dataset::concat(combine(datasets::Small3x1Shapes(), framework::dataset::make("OutputTile", { Size2D(4U, 1U) })), + framework::dataset::concat(combine(datasets::Small1x3Shapes(), framework::dataset::make("OutputTile", { Size2D(1U, 4U) })), + combine(datasets::Small5x5Shapes(), framework::dataset::make("OutputTile", { Size2D(4U, 4U) }))))); const auto LargeWinogradFilterTransformDatasetNCHW = framework::dataset::concat(combine(datasets::Large3x3Shapes(), framework::dataset::make("OutputTile", { Size2D(2U, 2U), Size2D(4U, 4U) })), diff --git a/tests/validation/reference/Winograd.cpp b/tests/validation/reference/Winograd.cpp index 026b30031c..132d252383 100644 --- a/tests/validation/reference/Winograd.cpp +++ b/tests/validation/reference/Winograd.cpp @@ -194,20 +194,6 @@ void initialize_matrix_transform(SimpleTensor<T> &src, const Size2D &output_tile } // namespace template <typename T> -void print_tile(SimpleTensor<T> &in) -{ - for(int y = 0; y < in.shape()[1]; y++) - { - for(int x = 0; x < in.shape()[0]; x++) - { - std::cout << in[x + y * in.shape()[0]] << " "; - } - - std::cout << std::endl; - } -} - -template <typename T> SimpleTensor<T> winograd_input_transform(const SimpleTensor<T> &in, const TensorShape &output_shape, const WinogradInfo &winograd_info) { ARM_COMPUTE_ERROR_ON(in.data_layout() != DataLayout::NCHW); |