From 8ae571454792327fc40641c72fe0b8de1e7d334f Mon Sep 17 00:00:00 2001 From: Jakub Sujak Date: Fri, 2 Dec 2022 16:09:06 +0000 Subject: Add Resize/Scale operator to Dynamic Fusion interface Resolves: COMPMID-5521 Change-Id: Id38a4ce18f9ea8805a151acb064e72795535d1a0 Signed-off-by: Jakub Sujak Signed-off-by: Gunes Bayir Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8859 Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Benchmark: Arm Jenkins --- tests/datasets/ScaleValidationDataset.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'tests/datasets') diff --git a/tests/datasets/ScaleValidationDataset.h b/tests/datasets/ScaleValidationDataset.h index c6987c0908..8987c3a1c1 100644 --- a/tests/datasets/ScaleValidationDataset.h +++ b/tests/datasets/ScaleValidationDataset.h @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_TEST_SCALE_VALIDATION_DATASET -#define ARM_COMPUTE_TEST_SCALE_VALIDATION_DATASET +#ifndef TESTS_DATASETS_SCALEVALIDATIONDATASET +#define TESTS_DATASETS_SCALEVALIDATIONDATASET #include "arm_compute/core/Types.h" #include "tests/datasets/BorderModeDataset.h" @@ -173,6 +173,11 @@ framework::dataset::make("AlignCorners", { true })); datasets::BorderModes()), \ samping_policy_set) +#define ASSEMBLE_DATASET_DYNAMIC_FUSION(shape, samping_policy_set) \ + combine(combine(combine((shape), framework::dataset::make("DataLayout", { DataLayout::NHWC })), \ + ScaleInterpolationPolicySet), \ + samping_policy_set) + #define ASSEMBLE_S8_DATASET(shape, samping_policy_set) \ combine(combine(combine(combine((shape), framework::dataset::make("DataLayout", DataLayout::NHWC)), \ framework::dataset::make("InterpolationPolicy", { InterpolationPolicy::BILINEAR })), \ @@ -194,6 +199,13 @@ framework::dataset::make("AlignCorners", { true })); datasets::BorderModes()), \ sampling_policy_set) +#define ASSEMBLE_QUANTIZED_DATASET_DYNAMIC_FUSION(shape, sampling_policy_set, quantization_info_set) \ + combine(combine(combine(combine(shape, \ + quantization_info_set), \ + framework::dataset::make("DataLayout", { DataLayout::NHWC })), \ + ScaleInterpolationPolicySet), \ + sampling_policy_set) + /** Generating dataset for quantized data tyeps with the given shapes */ #define ASSEMBLE_DIFFERENTLY_QUANTIZED_DATASET(shape, sampling_policy_set, input_quant_info_set, output_quant_info_set) \ combine(combine(combine(combine(combine(combine(shape, \ @@ -207,4 +219,4 @@ framework::dataset::make("AlignCorners", { true })); } // namespace datasets } // namespace test } // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_SCALE_VALIDATION_DATASET */ +#endif /* TESTS_DATASETS_SCALEVALIDATIONDATASET */ -- cgit v1.2.1