diff options
| author | Gian Marco <gianmarco.iodice@arm.com> | 2017-11-29 10:41:38 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:41:36 +0000 |
| commit | 5420b28d54c5238ed4c4aa2ccf02a7c3855c6760 (patch) | |
| tree | 44d201142f71622eaf9d711e2d38d4e1360586df /tests/validation/CL | |
| parent | a5e6d67ddad4c88cec87b23063e8493768bb2c61 (diff) | |
| download | ComputeLibrary-5420b28d54c5238ed4c4aa2ccf02a7c3855c6760.tar.gz | |
COMPMID-710 - Fix CLTranspose and NETranspose when the input shape is a
vector
Fixed replacing AccessWindowTranspose with AccessWindowStatic due to the
wrong padding calculation in the X direction within AccessWindowTranspose.
AccessWindowTranspose should be fixed with COMPMID-708
Change-Id: I665e130b897a213ae2bf9da4bf092dd491fa00c6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111057
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Michel Iwaniec <michel.iwaniec@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/validation/CL')
| -rw-r--r-- | tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp | 6 | ||||
| -rw-r--r-- | tests/validation/CL/Transpose.cpp | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp index 0fb464112a..186fc4c673 100644 --- a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp +++ b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp @@ -56,7 +56,7 @@ template <typename T> using CLFixedPointFixture = FixedPointValidationFixture<CLTensor, CLAccessor, T>; TEST_SUITE(Exp) -FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::EXP)), framework::dataset::make("FractionalBits", 1, 6))) @@ -67,7 +67,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(Log) -FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::LOG)), framework::dataset::make("FractionalBits", 3, 6))) @@ -78,7 +78,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(Invsqrt) -FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, CLFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::INV_SQRT)), framework::dataset::make("FractionalBits", 1, 6))) diff --git a/tests/validation/CL/Transpose.cpp b/tests/validation/CL/Transpose.cpp index bf3d29906d..b23aff4645 100644 --- a/tests/validation/CL/Transpose.cpp +++ b/tests/validation/CL/Transpose.cpp @@ -69,12 +69,14 @@ template <typename T> using CLTransposeFixture = TransposeValidationFixture<CLTensor, CLAccessor, CLTranspose, T>; TEST_SUITE(U8) -FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), framework::dataset::make("DataType", DataType::U8))) +FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(concat(datasets::Small1DShapes(), datasets::Small2DShapes()), + framework::dataset::make("DataType", DataType::U8))) { // Validate output validate(CLAccessor(_target), _reference); } -FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint8_t>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), framework::dataset::make("DataType", DataType::U8))) +FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint8_t>, framework::DatasetMode::NIGHTLY, combine(concat(datasets::Large1DShapes(), datasets::Large2DShapes()), + framework::dataset::make("DataType", DataType::U8))) { // Validate output validate(CLAccessor(_target), _reference); @@ -82,12 +84,14 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(U16) -FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint16_t>, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), framework::dataset::make("DataType", DataType::U16))) +FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint16_t>, framework::DatasetMode::PRECOMMIT, combine(concat(datasets::Small1DShapes(), datasets::Small2DShapes()), + framework::dataset::make("DataType", DataType::U16))) { // Validate output validate(CLAccessor(_target), _reference); } -FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint16_t>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), framework::dataset::make("DataType", DataType::U16))) +FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint16_t>, framework::DatasetMode::NIGHTLY, combine(concat(datasets::Large1DShapes(), datasets::Large2DShapes()), + framework::dataset::make("DataType", DataType::U16))) { // Validate output validate(CLAccessor(_target), _reference); @@ -95,12 +99,14 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint16_t>, framework::Datase TEST_SUITE_END() TEST_SUITE(U32) -FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint32_t>, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), framework::dataset::make("DataType", DataType::U32))) +FIXTURE_DATA_TEST_CASE(RunSmall, CLTransposeFixture<uint32_t>, framework::DatasetMode::PRECOMMIT, combine(concat(datasets::Small1DShapes(), datasets::Small2DShapes()), + framework::dataset::make("DataType", DataType::U32))) { // Validate output validate(CLAccessor(_target), _reference); } -FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint32_t>, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), framework::dataset::make("DataType", DataType::U32))) +FIXTURE_DATA_TEST_CASE(RunLarge, CLTransposeFixture<uint32_t>, framework::DatasetMode::NIGHTLY, combine(concat(datasets::Large1DShapes(), datasets::Large2DShapes()), + framework::dataset::make("DataType", DataType::U32))) { // Validate output validate(CLAccessor(_target), _reference); |