diff options
| author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2021-10-01 17:48:02 +0100 |
|---|---|---|
| committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2021-10-06 10:40:49 +0000 |
| commit | 8b8405aec8af17b04205b60094680751abfdc94a (patch) | |
| tree | ae8f7e68271acf4791cab04c6deaf9a9ddcb3b38 /tests/datasets/ScaleValidationDataset.h | |
| parent | 8229e5a8b5e38fcfa53cab5752f12e8f17a65e6c (diff) | |
| download | ComputeLibrary-8b8405aec8af17b04205b60094680751abfdc94a.tar.gz | |
Optimize CpuScale NHWC F32/F16
- Rework CpuScaleKernel F32/F16 NHWC - bilinear
- Rework CpuScaleKernel F32/F16 NHWC - nearest
- Add test to validate the vector computation path
Resolves COMPMID-4801, COMPMID-4802
Change-Id: Ie6e4f262a8cce509edd7b8f564c940758625c58a
Signed-off-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6361
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Diffstat (limited to 'tests/datasets/ScaleValidationDataset.h')
| -rw-r--r-- | tests/datasets/ScaleValidationDataset.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/datasets/ScaleValidationDataset.h b/tests/datasets/ScaleValidationDataset.h index c0073f93f5..11e0343582 100644 --- a/tests/datasets/ScaleValidationDataset.h +++ b/tests/datasets/ScaleValidationDataset.h @@ -147,7 +147,7 @@ framework::dataset::make("AlignCorners", { true })); */ #define SCALE_SHAPE_DATASET(element_per_iteration) \ concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 2>()), \ + ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 2>()), \ ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 1>()), \ ScaleShapesBaseDataSet<3, 3, (element_per_iteration), 0>()) @@ -166,7 +166,7 @@ framework::dataset::make("AlignCorners", { true })); */ #define SCALE_NIGHTLY_SHAPE_DATASET(element_per_iteration) \ concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 1>()), \ + ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 1>()), \ ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 0>()), \ ScaleShapesBaseDataSet<3, 3, (element_per_iteration), 0>()) @@ -177,6 +177,12 @@ framework::dataset::make("AlignCorners", { true })); datasets::BorderModes()), \ samping_policy_set) +#define ASSEMBLE_NHWC_DATASET(shape, samping_policy_set) \ + combine(combine(combine(combine((shape), framework::dataset::make("DataLayout", DataLayout::NHWC)), \ + ScaleInterpolationPolicySet), \ + framework::dataset::make("BorderMode", { BorderMode::CONSTANT, BorderMode::REPLICATE })), \ + samping_policy_set) + /** Generating dataset for quantized data tyeps with the given shapes */ #define ASSEMBLE_QUANTIZED_DATASET(shape, sampling_policy_set, quantization_info_set) \ combine(combine(combine(combine(combine(shape, \ |