From d97bc81173d369d75f34a00ca352d66525d9c82d Mon Sep 17 00:00:00 2001 From: Lev Proleev Date: Thu, 2 Apr 2020 17:31:04 +0100 Subject: Add 1.3 RESIZE_* tests with default values The tests are taken from 1.2 test specs. Fix: 152405977 Test: NNTest_static Change-Id: I15ad10dd826ddd63476153e3982c5218947ae9c3 --- .../test/specs/V1_3/resize_bilinear_v1_3.mod.py | 64 +++++++++++++++++++++ .../specs/V1_3/resize_nearest_neighbor_v1_3.mod.py | 65 +++++++++++++++++++++- 2 files changed, 128 insertions(+), 1 deletion(-) (limited to 'nn/runtime/test/specs/V1_3') diff --git a/nn/runtime/test/specs/V1_3/resize_bilinear_v1_3.mod.py b/nn/runtime/test/specs/V1_3/resize_bilinear_v1_3.mod.py index c4f9b3495..cc962f60b 100644 --- a/nn/runtime/test/specs/V1_3/resize_bilinear_v1_3.mod.py +++ b/nn/runtime/test/specs/V1_3/resize_bilinear_v1_3.mod.py @@ -530,3 +530,67 @@ test( input0_data=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], output_data=[1, 2.5, 4, 7, 8.5, 10, 13, 14.5, 16], ) + +# Test from version 1.2 to test default arguments removal +i2 = Input("op1", "TENSOR_FLOAT32", "{1, 2, 2, 2}") +o2 = Output("op4", "TENSOR_FLOAT32", "{1, 3, 3, 2}") +layout = BoolScalar("layout", False) # NHWC +align_corners = BoolScalar("align_corners", False) +half_pixel_centers = BoolScalar("half_pixel_centers", False) +model_shape = Model("shape").Operation("RESIZE_BILINEAR", i2, 3, 3, layout, + align_corners, half_pixel_centers).To(o2) +model_scale = Model("scale").Operation("RESIZE_BILINEAR", i2, 1.6, 1.6, layout, + align_corners, half_pixel_centers).To(o2) + +# Additional data type +quant8 = DataTypeConverter().Identify({ + i2: ("TENSOR_QUANT8_ASYMM", 0.25, 0), + o2: ("TENSOR_QUANT8_ASYMM", 0.25, 0) +}) + +values = { + i2: [3, 4, 6, 10, 9, 10, 12, 16], + o2: [3, 4, 5, 8, 6, 10, 7, 8, 9, 12, 10, 14, 9, 10, 11, 14, 12, 16] +} + +# Instantiate an example +Example( + values, model=model_shape, + name="default_values").AddNchw(i2, o2, layout).AddVariations( + "relaxed", "float16", quant8) +Example( + values, model=model_scale, + name="default_values").AddNchw(i2, o2, layout).AddVariations( + "relaxed", "float16", quant8) + +Example.SetVersion( + "V1_2", + "resize_bilinear_v1_3_scale_default_values_nchw", + "resize_bilinear_v1_3_scale_default_values_nchw_all_inputs_as_internal", + "resize_bilinear_v1_3_scale_default_values_nchw_float16", + "resize_bilinear_v1_3_scale_default_values_nchw_float16_all_inputs_as_internal", + "resize_bilinear_v1_3_scale_default_values_nchw_quant8", + "resize_bilinear_v1_3_scale_default_values_nchw_quant8_all_inputs_as_internal", + "resize_bilinear_v1_3_scale_default_values_nhwc", + "resize_bilinear_v1_3_scale_default_values_nhwc_all_inputs_as_internal", + "resize_bilinear_v1_3_scale_default_values_nhwc_float16", + "resize_bilinear_v1_3_scale_default_values_nhwc_float16_all_inputs_as_internal", + "resize_bilinear_v1_3_scale_default_values_nhwc_quant8", + "resize_bilinear_v1_3_scale_default_values_nhwc_quant8_all_inputs_as_internal", + "resize_bilinear_v1_3_shape_default_values_nchw", + "resize_bilinear_v1_3_shape_default_values_nchw_all_inputs_as_internal", + "resize_bilinear_v1_3_shape_default_values_nchw_float16", + "resize_bilinear_v1_3_shape_default_values_nchw_float16_all_inputs_as_internal", + "resize_bilinear_v1_3_shape_default_values_nchw_quant8", + "resize_bilinear_v1_3_shape_default_values_nchw_quant8_all_inputs_as_internal", + "resize_bilinear_v1_3_shape_default_values_nhwc_float16", + "resize_bilinear_v1_3_shape_default_values_nhwc_float16_all_inputs_as_internal", + "resize_bilinear_v1_3_shape_default_values_nhwc_quant8", + "resize_bilinear_v1_3_shape_default_values_nhwc_quant8_all_inputs_as_internal", +) + +Example.SetVersion( + "V1_0", + "resize_bilinear_v1_3_shape_default_values_nhwc", + "resize_bilinear_v1_3_shape_default_values_nhwc_all_inputs_as_internal", +) diff --git a/nn/runtime/test/specs/V1_3/resize_nearest_neighbor_v1_3.mod.py b/nn/runtime/test/specs/V1_3/resize_nearest_neighbor_v1_3.mod.py index 2080e2223..496408774 100644 --- a/nn/runtime/test/specs/V1_3/resize_nearest_neighbor_v1_3.mod.py +++ b/nn/runtime/test/specs/V1_3/resize_nearest_neighbor_v1_3.mod.py @@ -190,7 +190,7 @@ test( half_pixel_centers=BoolScalar("half_pixel_centers", False), output0=Output("output0", "TENSOR_FLOAT32", "{1, 3, 3, 1}"), input0_data=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16], - output_data=[1, 3, 4, 9, 11, 12, 13, 15, 16], + output_data=[1, 3, 4, 9, 11, 12, 13, 15, 16], ) test( @@ -205,3 +205,66 @@ test( input0_data=[1, 2, 3, 4], output_data=[1], ) + +# Test from version 1.2 to test default arguments removal +i1 = Input("in", "TENSOR_FLOAT32", "{2, 2, 2, 2}") +o1 = Output("out", "TENSOR_FLOAT32", "{2, 3, 3, 2}") +layout = BoolScalar("layout", False) # NHWC +align_corners = BoolScalar("align_corners", False) +half_pixel_centers = BoolScalar("half_pixel_centers", False) +model_shape = Model("shape").Operation("RESIZE_NEAREST_NEIGHBOR", i1, 3, 3, + layout, align_corners, + half_pixel_centers).To(o1) +model_scale = Model("scale").Operation("RESIZE_NEAREST_NEIGHBOR", i1, 1.6, 1.8, + layout, align_corners, + half_pixel_centers).To(o1) + +quant8 = DataTypeConverter().Identify({ + i1: ("TENSOR_QUANT8_ASYMM", 0.25, 100), + o1: ("TENSOR_QUANT8_ASYMM", 0.25, 100) +}) + +values = { + i1: [1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8], + o1: [ + 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, + 5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8 + ] +} + +Example( + values, model=model_shape, + name="default_values").AddNchw(i1, o1, layout).AddVariations( + "relaxed", quant8, "float16") +Example( + values, model=model_scale, + name="default_values").AddNchw(i1, o1, layout).AddVariations( + "relaxed", quant8, "float16") + +Example.SetVersion( + "V1_2", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw_float16", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw_float16_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw_quant8", + "resize_nearest_neighbor_v1_3_scale_default_values_nchw_quant8_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc_float16", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc_float16_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc_quant8", + "resize_nearest_neighbor_v1_3_scale_default_values_nhwc_quant8_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw_float16", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw_float16_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw_quant8", + "resize_nearest_neighbor_v1_3_shape_default_values_nchw_quant8_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc_float16", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc_float16_all_inputs_as_internal", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc_quant8", + "resize_nearest_neighbor_v1_3_shape_default_values_nhwc_quant8_all_inputs_as_internal", +) -- cgit v1.2.3