Merge pull request #932 from peri044/resize

Add half pixel transformation to resize bilinear op

Author: jignparm

tests/test_backend.py

@@ -64,6 +64,7 @@
     resize_nearest_neighbor = tf.compat.v1.image.resize_nearest_neighbor
     quantize_and_dequantize = tf.quantization.quantize_and_dequantize
     resize_bilinear = tf.compat.v1.image.resize_bilinear
+    resize_bilinear_v2 = tf.compat.v2.image.resize
     is_nan = tf.math.is_nan
     is_inf = tf.math.is_inf
     floormod = tf.math.floormod
@@ -81,6 +82,7 @@
     quantize_and_dequantize = tf.compat.v1.quantization.quantize_and_dequantize
     resize_nearest_neighbor = tf.compat.v1.image.resize_nearest_neighbor
     resize_bilinear = tf.compat.v1.image.resize_bilinear
+    resize_bilinear_v2 = tf.compat.v2.image.resize
     is_nan = tf.math.is_nan
     is_inf = tf.math.is_inf
     floormod = tf.floormod
@@ -1993,6 +1995,17 @@ def func(x, x_new_size_):
             return tf.identity(x_, name=_TFOUTPUT)
         self._run_test_case(func, [_OUTPUT], {_INPUT: x_val, _INPUT1: x_new_size})
 
+    @check_tf_min_version("1.14")
+    @check_opset_min_version(11, "resize_bilinear_v2")
+    def test_resize_bilinear_v2_with_non_const(self):
+        x_shape = [3, 10, 8, 5]
+        x_val = np.arange(1, 1 + np.prod(x_shape), dtype=np.float32).reshape(x_shape)
+        x_new_size = np.array([20, 16]).astype(np.int32)
+        def func(x, x_new_size_):
+            x_ = resize_bilinear_v2(x, x_new_size_)
+            return tf.identity(x_, name=_TFOUTPUT)
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val, _INPUT1: x_new_size})
+
     @check_opset_min_version(10, "resize scale can less than 1")
     def test_resize_nearest_neighbor2(self):
         x_shape = [1, 300, 20, 2]

tf2onnx/onnx_opset/nn.py

@@ -736,9 +736,12 @@ def version_11(cls, ctx, node, **kwargs):
             const_empty_float.output[0],
             concat_shape.output[0]
         ]
+        transformation_mode = "asymmetric"
+        if "half_pixel_centers" in node.attr and node.attr["half_pixel_centers"].i:
+            transformation_mode = "half_pixel"
         resize = ctx.make_node("Resize", resize_inputs,
                                attr={"mode": mode, "nearest_mode": "floor",
-                                     "coordinate_transformation_mode": "asymmetric"})
+                                     "coordinate_transformation_mode": transformation_mode})
         shapes = node.output_shapes
         dtypes = node.output_dtypes
         ctx.remove_node(node.name)