Skip to content

Commit

Permalink
Support quantised SQRT operator in TFLite
Browse files Browse the repository at this point in the history
  • Loading branch information
elinx committed Oct 12, 2021
1 parent 88b2be8 commit d53b8db
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 14 deletions.
2 changes: 0 additions & 2 deletions python/tvm/relay/frontend/tflite.py
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,6 @@ def convert_cos(self, op):

def convert_sqrt(self, op):
"""Convert TFLite SQRT"""
if self.is_quantized(op):
raise tvm.error.OpNotImplemented("TFlite quantized SQRT operator is not supported yet.")
return self._convert_unary_elemwise(_op.sqrt, op)

def convert_rsqrt(self, op):
Expand Down
53 changes: 41 additions & 12 deletions tests/python/frontend/tflite/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -1858,16 +1858,6 @@ def _test_tan(data):
return _test_unary_elemwise(math_ops.tan, data)


#######################################################################
# Sqrt
# ----


def _test_sqrt(data):
"""One iteration of sqrt"""
return _test_unary_elemwise(math_ops.sqrt, data)


#######################################################################
# Neg
# ---
Expand Down Expand Up @@ -1900,7 +1890,7 @@ def _test_elu(data):

def _test_forward_unary_elemwise(test_op):
# functions that need positive input
if test_op.__name__ in {"_test_log", "_test_sqrt"}:
if test_op.__name__ in {"_test_log"}:
test_op(np.arange(1.0, 7.0, dtype=np.float32).reshape((2, 1, 3)))
else:
test_op(np.random.uniform(-10, 10, (3, 2)).astype(np.float32))
Expand All @@ -1912,7 +1902,6 @@ def test_all_unary_elemwise():
_test_forward_unary_elemwise(_test_exp)
_test_forward_unary_elemwise(_test_log)
_test_forward_unary_elemwise(_test_sin)
_test_forward_unary_elemwise(_test_sqrt)
_test_forward_unary_elemwise(_test_neg)
_test_forward_unary_elemwise(_test_square)
# ceil and cos come with TFLite 1.14.0.post1 fbs schema
Expand Down Expand Up @@ -3380,6 +3369,45 @@ def test_forward_rsqrt():
_test_rsqrt(np.arange(1, 240, 40, dtype=np.uint8).reshape((2, 1, 3)), quantized=True)


#######################################################################
# SQRT
# ----


def _test_sqrt(data, quantized=False):
"""One iteration of SQRT"""
with tf.Graph().as_default():
in_data = array_ops.placeholder(shape=data.shape, dtype="float32", name="in_0")

if quantized:
inq_data = tf.quantization.fake_quant_with_min_max_args(
in_data, min=1, max=6, name="inq_0"
)
input_range = {"inq_0": (1, 6)}
out = math_ops.sqrt(inq_data)
out = tf.quantization.fake_quant_with_min_max_args(out, min=1, max=6, name="out")
compare_tflite_with_tvm(
data,
"inq_0:0",
[inq_data],
[out],
quantized=True,
input_range=input_range,
experimental_new_converter=True,
)
else:
out = math_ops.sqrt(in_data)
compare_tflite_with_tvm(data, "in_0:0", [in_data], [out])


def test_forward_sqrt():
"""SQRT"""
_test_sqrt(np.arange(1.0, 7.0, dtype=np.float32), quantized=False)
_test_sqrt(np.arange(1.0, 7.0, dtype=np.float32).reshape((2, 1, 3)), quantized=False)
_test_sqrt(np.arange(1, 240, 40, dtype=np.uint8), quantized=True)
_test_sqrt(np.arange(1, 240, 40, dtype=np.uint8).reshape((2, 1, 3)), quantized=True)


#######################################################################
# ReLu
# ----
Expand Down Expand Up @@ -4590,6 +4618,7 @@ def test_prevent_tensorflow_dynamic_range():
test_forward_softmax()
test_forward_tanh()
test_forward_rsqrt()
test_forward_sqrt()
test_forward_relu()
test_forward_relu6()
test_forward_leaky_relu()
Expand Down

0 comments on commit d53b8db

Please sign in to comment.