From be39f1281ee4ad4e83b92ad5a09f6bdc40b5718f Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Fri, 8 Jun 2018 17:50:38 +0100 Subject: COMPMID-1204 Add NHWC data format support to Winograd input transform 4x4_5x5 Change-Id: I3dffdd1772b78db27a4374f074a24a15a9552189 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/134859 Reviewed-by: Gian Marco Iodice Tested-by: Jenkins --- tests/validation/CL/Winograd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/validation/CL/Winograd.cpp b/tests/validation/CL/Winograd.cpp index 7f866cd11a..b869f4c314 100644 --- a/tests/validation/CL/Winograd.cpp +++ b/tests/validation/CL/Winograd.cpp @@ -129,7 +129,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(frame FIXTURE_DATA_TEST_CASE(RunSmall, CLWinogradInputTransformFixture, framework::DatasetMode::PRECOMMIT, combine(framework::dataset::concat(combine(SmallWinogradInputTransformDataset, framework::dataset::make("DataLayout", { DataLayout::NCHW })), - combine(datasets::SmallWinogradInputTransformDataset4x4_3x3(), + combine(framework::dataset::concat(datasets::SmallWinogradInputTransformDataset4x4_3x3(), datasets::SmallWinogradInputTransformDataset4x4_5x5()), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), framework::dataset::make("DataType", { DataType::F32 }))) { @@ -138,7 +138,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLWinogradInputTransformFixture, framework::Dat FIXTURE_DATA_TEST_CASE(RunLarge, CLWinogradInputTransformFixture, framework::DatasetMode::NIGHTLY, combine(framework::dataset::concat(combine(LargeWinogradInputTransformDataset, framework::dataset::make("DataLayout", { DataLayout::NCHW })), - combine(datasets::LargeWinogradInputTransformDataset4x4_3x3(), + combine(framework::dataset::concat(datasets::LargeWinogradInputTransformDataset4x4_3x3(), datasets::LargeWinogradInputTransformDataset4x4_5x5()), framework::dataset::make("DataLayout", { DataLayout::NHWC }))), framework::dataset::make("DataType", { DataType::F32 }))) { -- cgit v1.2.1