aboutsummaryrefslogtreecommitdiff
path: root/tests/validation
diff options
context:
space:
mode:
Diffstat (limited to 'tests/validation')
-rw-r--r--tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp6
-rw-r--r--tests/validation/CL/Transpose.cpp18
-rw-r--r--tests/validation/NEON/FixedPoint/FixedPoint.cpp14
-rw-r--r--tests/validation/NEON/FixedPoint/FixedPointTarget.h2
4 files changed, 24 insertions, 16 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);
diff --git a/tests/validation/NEON/FixedPoint/FixedPoint.cpp b/tests/validation/NEON/FixedPoint/FixedPoint.cpp
index 3b25b0524b..871143bc19 100644
--- a/tests/validation/NEON/FixedPoint/FixedPoint.cpp
+++ b/tests/validation/NEON/FixedPoint/FixedPoint.cpp
@@ -61,7 +61,7 @@ using NEFixedPointFixture = FixedPointValidationFixture<Tensor, Accessor, T>;
TEST_SUITE(QS8)
TEST_SUITE(Exp)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<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, 7)))
@@ -72,7 +72,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset
TEST_SUITE_END()
TEST_SUITE(Invsqrt)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<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)))
@@ -83,7 +83,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset
TEST_SUITE_END()
TEST_SUITE(Log)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<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)))
@@ -94,7 +94,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset
TEST_SUITE_END()
TEST_SUITE(Reciprocal)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType",
DataType::QS8)),
framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)),
framework::dataset::make("FractionalBits", 1, 6)))
@@ -107,7 +107,7 @@ TEST_SUITE_END()
TEST_SUITE(QS16)
TEST_SUITE(Exp)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType",
DataType::QS16)),
framework::dataset::make("FixedPointOp", FixedPointOp::EXP)),
framework::dataset::make("FractionalBits", 1, 15)))
@@ -130,7 +130,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::Datase
TEST_SUITE_END()
TEST_SUITE(Log)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType",
DataType::QS16)),
framework::dataset::make("FixedPointOp", FixedPointOp::LOG)),
framework::dataset::make("FractionalBits", 4, 14)))
@@ -141,7 +141,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::Datase
TEST_SUITE_END()
TEST_SUITE(Reciprocal)
-FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType",
+FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType",
DataType::QS16)),
framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)),
framework::dataset::make("FractionalBits", 1, 14)))
diff --git a/tests/validation/NEON/FixedPoint/FixedPointTarget.h b/tests/validation/NEON/FixedPoint/FixedPointTarget.h
index fa1d97f152..31ccc0817e 100644
--- a/tests/validation/NEON/FixedPoint/FixedPointTarget.h
+++ b/tests/validation/NEON/FixedPoint/FixedPointTarget.h
@@ -50,6 +50,7 @@ void compute_target_impl(const TensorShape &shape, DataType dt, FixedPointOp op,
window = calculate_max_window(*src.info(), Steps(num_elems_processed_per_iteration));
AccessWindowHorizontal input_access(src.info(), 0, num_elems_processed_per_iteration);
AccessWindowHorizontal output_access(dst.info(), 0, num_elems_processed_per_iteration);
+ update_window_and_padding(window, input_access, output_access);
break;
}
case DataType::QS16:
@@ -58,6 +59,7 @@ void compute_target_impl(const TensorShape &shape, DataType dt, FixedPointOp op,
window = calculate_max_window(*src.info(), Steps(num_elems_processed_per_iteration));
AccessWindowHorizontal input_access(src.info(), 0, num_elems_processed_per_iteration);
AccessWindowHorizontal output_access(dst.info(), 0, num_elems_processed_per_iteration);
+ update_window_and_padding(window, input_access, output_access);
break;
}
default:
generated by cgit v1.2.1 (git 2.23.0) at 2024-07-07 04:07:44 +0000