From de98514a14fea9168049074b4e9b4328fc35ae80 Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:44:53 +0800 Subject: [PATCH 1/8] add quantized greater_equal --- python/tvm/relay/frontend/tflite.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python/tvm/relay/frontend/tflite.py b/python/tvm/relay/frontend/tflite.py index 6728263c7f0e..2ee2598864ad 100644 --- a/python/tvm/relay/frontend/tflite.py +++ b/python/tvm/relay/frontend/tflite.py @@ -1474,10 +1474,6 @@ def convert_squared_difference(self, op): def convert_greater_equal(self, op): """Convert TFLite GREATER_EQUAL""" - if self.is_quantized(op): - raise tvm.error.OpNotImplemented( - "TFlite quantized GREATER_EQUAL operator is not supported yet." - ) return self._convert_elemwise(_op.greater_equal, op) def convert_less(self, op): From 829272f023ba529405750d1d95a1cd3c5be09258 Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:48:08 +0800 Subject: [PATCH 2/8] add tests for quantized greater_equal --- tests/python/frontend/tflite/test_forward.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/python/frontend/tflite/test_forward.py b/tests/python/frontend/tflite/test_forward.py index ab89de6301b2..b981145c1cb8 100644 --- a/tests/python/frontend/tflite/test_forward.py +++ b/tests/python/frontend/tflite/test_forward.py @@ -2679,9 +2679,17 @@ def _test_greater(data, fused_activation_function=None, quantized=False, qnn_op= # ------------- -def _test_greater_equal(data): +def _test_greater_equal(data, fused_activation_function=None, quantized=False, qnn_op=None): """One iteration of greater_equal""" - return _test_elemwise(math_ops.greater_equal, data) + return _test_elemwise( + math_ops.greater_equal, + data, + fused_activation_function, + quantized, + qnn_op, + same_qnn_params=True, + comparison_op=True, + ) ####################################################################### @@ -2850,6 +2858,7 @@ def _test_elemwise_qnn_out_range(qnn_op): _test_less: (-150, 150), _test_floor_mod: (-150, 150), _test_not_equal: (-150, 150), + _test_greater_equal: (-150, 150), } return qnn_out_range[qnn_op] @@ -2885,6 +2894,7 @@ def test_all_elemwise(): _test_forward_elemwise(_test_squared_difference) _test_forward_elemwise_quantized(_test_squared_difference, np.int8) _test_forward_elemwise(_test_greater_equal) + _test_forward_elemwise_quantized(_test_greater_equal) _test_forward_elemwise(_test_less) _test_forward_elemwise_quantized(_test_less) _test_forward_elemwise(_test_less_equal) From 773ab5776dc1bbb8d65fbf30979de6e3456338f2 Mon Sep 17 00:00:00 2001 From: Tlopex <820958424@qq.com> Date: Tue, 19 Sep 2023 10:33:38 +0800 Subject: [PATCH 3/8] retrigger checks From bc47c5077f459314b90d0c8c04c16eee449c541e Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:48:08 +0800 Subject: [PATCH 4/8] add tests for quantized greater_equal From 806365f170a72be81e0e6d10e1ce1a959bc001eb Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:12:34 +0800 Subject: [PATCH 5/8] Update tflite.py --- python/tvm/relay/frontend/tflite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tvm/relay/frontend/tflite.py b/python/tvm/relay/frontend/tflite.py index 2ee2598864ad..fa94dd15ae4b 100644 --- a/python/tvm/relay/frontend/tflite.py +++ b/python/tvm/relay/frontend/tflite.py @@ -1474,7 +1474,7 @@ def convert_squared_difference(self, op): def convert_greater_equal(self, op): """Convert TFLite GREATER_EQUAL""" - return self._convert_elemwise(_op.greater_equal, op) + return self._convert_elemwise(_op.greater_equal, op, self.is_quantized(op), comparison_op=True) def convert_less(self, op): """Convert TFLite LESS""" From 24de817835aa731971c1f9afbd40da9b0edc99c6 Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:12:34 +0800 Subject: [PATCH 6/8] Update tflite.py From bee2eaea754975dc4ed22f04d2bf26fdd44e9c1e Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:21:44 +0800 Subject: [PATCH 7/8] fix formating problems --- python/tvm/relay/frontend/tflite.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/tvm/relay/frontend/tflite.py b/python/tvm/relay/frontend/tflite.py index fa94dd15ae4b..700886fb6ae3 100644 --- a/python/tvm/relay/frontend/tflite.py +++ b/python/tvm/relay/frontend/tflite.py @@ -1448,7 +1448,9 @@ def convert_minimum(self, op): def convert_greater(self, op): """Convert TFLite GREATER""" - return self._convert_elemwise(_op.greater, op, self.is_quantized(op), comparison_op=True) + return self._convert_elemwise( + _op.greater_equal, op, self.is_quantized(op), comparison_op=True + ) def convert_squared_difference(self, op): """Convert TFLite SQUARED DIFFERENCE""" @@ -1472,7 +1474,7 @@ def convert_squared_difference(self, op): out = _op.power(difference, relay.const(2, exp_type)) return out - def convert_greater_equal(self, op): + def convert_(self, op): """Convert TFLite GREATER_EQUAL""" return self._convert_elemwise(_op.greater_equal, op, self.is_quantized(op), comparison_op=True) From 70fbe355000ca69f1428e9406dc5a146709b0966 Mon Sep 17 00:00:00 2001 From: Tlopex <68688494+tlopex@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:44:03 +0800 Subject: [PATCH 8/8] fix formating problem --- python/tvm/relay/frontend/tflite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/tvm/relay/frontend/tflite.py b/python/tvm/relay/frontend/tflite.py index 700886fb6ae3..9e72049ecda5 100644 --- a/python/tvm/relay/frontend/tflite.py +++ b/python/tvm/relay/frontend/tflite.py @@ -1448,9 +1448,7 @@ def convert_minimum(self, op): def convert_greater(self, op): """Convert TFLite GREATER""" - return self._convert_elemwise( - _op.greater_equal, op, self.is_quantized(op), comparison_op=True - ) + return self._convert_elemwise(_op.greater, op, self.is_quantized(op), comparison_op=True) def convert_squared_difference(self, op): """Convert TFLite SQUARED DIFFERENCE""" @@ -1474,9 +1472,11 @@ def convert_squared_difference(self, op): out = _op.power(difference, relay.const(2, exp_type)) return out - def convert_(self, op): + def convert_greater_equal(self, op): """Convert TFLite GREATER_EQUAL""" - return self._convert_elemwise(_op.greater_equal, op, self.is_quantized(op), comparison_op=True) + return self._convert_elemwise( + _op.greater_equal, op, self.is_quantized(op), comparison_op=True + ) def convert_less(self, op): """Convert TFLite LESS"""