aboutsummaryrefslogtreecommitdiff
path: root/tests/validation/NEON/ReorgLayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/validation/NEON/ReorgLayer.cpp')
-rw-r--r--tests/validation/NEON/ReorgLayer.cpp158
1 files changed, 79 insertions, 79 deletions
diff --git a/tests/validation/NEON/ReorgLayer.cpp b/tests/validation/NEON/ReorgLayer.cpp
index 6489b6529f..5a76315d77 100644
--- a/tests/validation/NEON/ReorgLayer.cpp
+++ b/tests/validation/NEON/ReorgLayer.cpp
@@ -28,7 +28,7 @@
#include "tests/NEON/Accessor.h"
#include "tests/PaddingCalculator.h"
-#include "tests/datasets/ShapeDatasets.h"
+#include "tests/datasets/ReorgLayerDataset.h"
#include "tests/framework/Asserts.h"
#include "tests/framework/Macros.h"
#include "tests/framework/datasets/Datasets.h"
@@ -44,124 +44,124 @@ namespace validation
TEST_SUITE(NEON)
TEST_SUITE(ReorgLayer)
-DATA_TEST_CASE(Configuration,
- framework::DatasetMode::ALL,
- combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()),
- framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 })),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
+// *INDENT-OFF*
+// clang-format off
+DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
+ framework::dataset::make("InputInfo", { TensorInfo(TensorShape(10U, 12U, 1U, 2U), 1, DataType::S64), // Wrong output tensor
+ TensorInfo(TensorShape(10U, 12U, 1U, 2U), 1, DataType::F32),
+ TensorInfo(TensorShape(10U, 12U, 1U, 2U), 1, DataType::F32), // Wrong output tensor
+ TensorInfo(TensorShape(3U, 12U, 4U, 2U), 1, DataType::F32),
+ TensorInfo(TensorShape(3U, 12U, 4U, 2U), 1, DataType::F32), // Wrong data type
+ }),
+ framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(3U, 4U, 10U, 2U), 1, DataType::S64),
+ TensorInfo(TensorShape(5U, 6U, 4U, 2U), 1, DataType::F32),
+ TensorInfo(TensorShape(5U, 6U, 2, 2U), 1, DataType::F32),
+ TensorInfo(TensorShape(1U, 4U, 36U, 2U), 1, DataType::F32),
+ TensorInfo(TensorShape(1U, 4U, 36U, 2U), 1, DataType::F16),
+ })),
+ framework::dataset::make("Stride", { 2, 2, 4, 3 })),
+ framework::dataset::make("Expected", { false, true, false, true, false })),
+ input_info, output_info, stride, expected)
+{
+ bool status = bool(NEReorgLayer::validate(&input_info, &output_info, stride));
+ ARM_COMPUTE_EXPECT(status == expected, framework::LogLevel::ERRORS);
+}
+// clang-format on
+// *INDENT-ON*
+
+DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(framework::dataset::concat(datasets::SmallReorgLayerDataset(), datasets::LargeReorgLayerDataset()),
+ framework::dataset::make("DataType", { DataType::F32, DataType::F16, DataType::QASYMM8 })),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
shape, stride, data_type, data_layout)
{
+ // Permute the tensor shape in case of NHWC data layout
+ TensorShape shape_to_use = shape;
+ if(data_layout == DataLayout::NHWC)
+ {
+ permute(shape_to_use, PermutationVector(2U, 0U, 1U));
+ }
+
// Create tensors
- Tensor ref_src = create_tensor<Tensor>(shape, data_type, 1, QuantizationInfo(), data_layout);
+ Tensor src = create_tensor<Tensor>(shape_to_use, data_type, 1, QuantizationInfo(), data_layout);
Tensor dst;
- // Create and Configure function
- NEReorgLayer reorg_func;
- reorg_func.configure(&ref_src, &dst, stride);
+ ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS);
+
+ // Create and configure function
+ NEReorgLayer reorg_layer;
+
+ // Auto-initialize the output within the function
+ reorg_layer.configure(&src, &dst, stride);
// Validate valid region
- const ValidRegion valid_region = shape_to_valid_region(dst.info()->tensor_shape());
- validate(dst.info()->valid_region(), valid_region);
-}
+ const ValidRegion src_valid_region = shape_to_valid_region(shape_to_use);
+ const ValidRegion dst_valid_region = shape_to_valid_region(dst.info()->tensor_shape());
+ validate(src.info()->valid_region(), src_valid_region);
+ validate(dst.info()->valid_region(), dst_valid_region);
-// *INDENT-OFF*
-// clang-format off
-DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(
- framework::dataset::make("InputInfo",{
- TensorInfo(TensorShape(8U, 8U, 5U, 3U), 1, DataType::U16), // Invalid stride
- TensorInfo(TensorShape(8U, 8U, 5U, 3U), 1, DataType::U16), // Invalid output shape
- TensorInfo(TensorShape(8U, 8U, 5U, 3U), 1, DataType::U16), // valid
- }),
- framework::dataset::make("OutputInfo", {
- TensorInfo(TensorShape(4U, 4U, 20U, 3U), 1, DataType::U16),
- TensorInfo(TensorShape(4U, 4U, 10U, 3U), 1, DataType::U16),
- TensorInfo(TensorShape(4U, 4U, 20U, 3U), 1, DataType::U16),
- })),
- framework::dataset::make("Stride", { -1, 2, 2 })),
- framework::dataset::make("Expected", { false, false, true })),
- input_info, output_info, stride, expected)
-{
- Status status = NEReorgLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), stride);
- ARM_COMPUTE_EXPECT(bool(status) == expected, framework::LogLevel::ERRORS);
+ // Validate padding
+ const int step = 1;
+ const PaddingSize src_padding = PaddingCalculator(shape_to_use.x(), step).required_padding();
+ const PaddingSize dst_padding = PaddingCalculator(dst.info()->tensor_shape().x(), step).required_padding();
+ validate(src.info()->padding(), src_padding);
+ validate(dst.info()->padding(), dst_padding);
}
-// clang-format on
-// *INDENT-ON*
template <typename T>
using NEReorgLayerFixture = ReorgLayerValidationFixture<Tensor, Accessor, NEReorgLayer, T>;
-TEST_SUITE(U8)
-FIXTURE_DATA_TEST_CASE(RunSmall,
- NEReorgLayerFixture<uint8_t>,
- framework::DatasetMode::PRECOMMIT,
- combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U8)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+TEST_SUITE(S32)
+FIXTURE_DATA_TEST_CASE(RunSmall, NEReorgLayerFixture<int32_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::SmallReorgLayerDataset(), framework::dataset::make("DataType",
+ DataType::S32)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge,
- NEReorgLayerFixture<uint8_t>,
- framework::DatasetMode::NIGHTLY,
- combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U8)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+FIXTURE_DATA_TEST_CASE(RunLarge, NEReorgLayerFixture<int32_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeReorgLayerDataset(), framework::dataset::make("DataType",
+ DataType::S32)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-TEST_SUITE_END() // U8
-
-TEST_SUITE(U16)
-FIXTURE_DATA_TEST_CASE(RunSmall,
- NEReorgLayerFixture<uint16_t>,
- framework::DatasetMode::PRECOMMIT,
- combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U16)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+TEST_SUITE_END() // S32
+
+TEST_SUITE(S16)
+FIXTURE_DATA_TEST_CASE(RunSmall, NEReorgLayerFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::SmallReorgLayerDataset(), framework::dataset::make("DataType",
+ DataType::S16)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge,
- NEReorgLayerFixture<uint16_t>,
- framework::DatasetMode::NIGHTLY,
- combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U16)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+FIXTURE_DATA_TEST_CASE(RunLarge, NEReorgLayerFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeReorgLayerDataset(), framework::dataset::make("DataType",
+ DataType::S16)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-TEST_SUITE_END() // U16
-
-TEST_SUITE(U32)
-FIXTURE_DATA_TEST_CASE(RunSmall,
- NEReorgLayerFixture<uint32_t>,
- framework::DatasetMode::PRECOMMIT,
- combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U32)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+TEST_SUITE_END() // S16
+
+TEST_SUITE(S8)
+FIXTURE_DATA_TEST_CASE(RunSmall, NEReorgLayerFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(datasets::SmallReorgLayerDataset(), framework::dataset::make("DataType",
+ DataType::S8)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-FIXTURE_DATA_TEST_CASE(RunLarge,
- NEReorgLayerFixture<uint32_t>,
- framework::DatasetMode::NIGHTLY,
- combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("Stride", { 2, 3 })),
- framework::dataset::make("DataType", DataType::U32)),
- framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
+FIXTURE_DATA_TEST_CASE(RunLarge, NEReorgLayerFixture<int8_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeReorgLayerDataset(), framework::dataset::make("DataType", DataType::S8)),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
{
// Validate output
validate(Accessor(_target), _reference);
}
-TEST_SUITE_END() // U32
+TEST_SUITE_END() // S8
TEST_SUITE_END() // ReorgLayer
TEST_SUITE_END() // NEON
generated by cgit v1.2.1 (git 2.23.0) at 2024-05-20 19:40:31 +0000