diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2018-06-08 16:30:00 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:53:09 +0000 |
| commit | 80d65d8f27f3ade2b461517c4fa29938c37590ed (patch) | |
| tree | 851826cbe6470c52034cbc327d2160a0ccb685a6 /tests/validation/CL/Winograd.cpp | |
| parent | 0fc25454b6ce499b7f89792f91b81a61a42d3182 (diff) | |
| download | ComputeLibrary-80d65d8f27f3ade2b461517c4fa29938c37590ed.tar.gz | |
COMPMID-1204 Add NHWC data format support to Winograd filter transform 4x4_5x5
Change-Id: I09adb8493fd2c438871c3d734cadf4b950c24d25
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/134822
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/CL/Winograd.cpp')
| -rw-r--r-- | tests/validation/CL/Winograd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/validation/CL/Winograd.cpp b/tests/validation/CL/Winograd.cpp index e0b4b5f795..7f866cd11a 100644 --- a/tests/validation/CL/Winograd.cpp +++ b/tests/validation/CL/Winograd.cpp @@ -216,7 +216,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLWinogradFilterTransformFixture, framework::Da framework::dataset::make("OutputTile", Size2D(4U, 4U)))), combine(datasets::Small5x5Shapes(), framework::dataset::make("OutputTile", Size2D(4U, 4U)))), framework::dataset::make("DataLayout", { DataLayout::NCHW })), - combine(combine(datasets::Small3x3Shapes(), framework::dataset::make("OutputTile", Size2D(4U, 4U))), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), + combine(combine(framework::dataset::concat(datasets::Small3x3Shapes(), datasets::Small5x5Shapes()), framework::dataset::make("OutputTile", Size2D(4U, 4U))), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), framework::dataset::make("DataType", { DataType::F32 }))) { // Validate output @@ -229,7 +229,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLWinogradFilterTransformFixture, framework::Da framework::dataset::make("OutputTile", Size2D(4U, 4U)))), combine(datasets::Large5x5Shapes(), framework::dataset::make("OutputTile", Size2D(4U, 4U)))), framework::dataset::make("DataLayout", { DataLayout::NCHW })), - combine(combine(datasets::Large3x3Shapes(), framework::dataset::make("OutputTile", Size2D(4U, 4U))), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), + combine(combine(framework::dataset::concat(datasets::Large3x3Shapes(), datasets::Large5x5Shapes()), framework::dataset::make("OutputTile", Size2D(4U, 4U))), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), framework::dataset::make("DataType", { DataType::F32 }))) { // Validate output |