Skip to content

Commit

Permalink
Fix tests for tflite unary elemwise operations (apache#4913)
Browse files Browse the repository at this point in the history
* add TFLite version check for 'ceil' and 'cos'
* fix name check of test_op for positive inputs
* add error message for operator not found in the installed fbs schema
  • Loading branch information
inadob authored and alexwong committed Feb 28, 2020
1 parent 4f5041c commit e6930fa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
6 changes: 5 additions & 1 deletion python/tvm/relay/frontend/tflite.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ def get_op_code_str(self, op):

op_code_list_idx = op.OpcodeIndex()
op_code_id = self.model.OperatorCodes(op_code_list_idx).BuiltinCode()
op_code_str = self.builtin_op_code[op_code_id]
try:
op_code_str = self.builtin_op_code[op_code_id]
except KeyError:
raise NotImplementedError('TFLite operator with code ' + str(op_code_id) + \
' is not supported by this version of the fbs schema.')
if op_code_id == BuiltinOperator.CUSTOM:
# Custom operator
custom_op_code_str = self.model.OperatorCodes(op_code_list_idx).CustomCode()
Expand Down
15 changes: 8 additions & 7 deletions tests/python/frontend/tflite/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ def _test_unary_elemwise(math_op, data):
with tf.Graph().as_default():
in_data = array_ops.placeholder(shape=data.shape, dtype=data.dtype, name='in')
out = math_op(in_data)
compare_tflite_with_tvm(data, ['in:0'], in_data, [out])
compare_tflite_with_tvm(data, ['in:0'], [in_data], [out])

#######################################################################
# Abs
Expand Down Expand Up @@ -745,23 +745,24 @@ def _test_neg(data):

def _test_forward_unary_elemwise(test_op):
# functions that need positive input
if test_op in {'_test_log', '_test_sqrt', '_test_rsqrt'}:
test_op(np.arange(6.0, dtype=np.float32).reshape((2, 1, 3)))
test_op(np.arange(6.0, dtype=np.int32).reshape((2, 1, 3)))
if test_op.__name__ in {'_test_log', '_test_sqrt', '_test_rsqrt'}:
test_op(np.arange(1.0, 7.0, dtype=np.float32).reshape((2, 1, 3)))
else:
np.array(np.random.uniform(-5, 5, (3, 1)), dtype=np.int32)
test_op(np.random.uniform(-10, 10, (3, 2)).astype(np.float32))

def test_all_unary_elemwise():
_test_forward_unary_elemwise(_test_abs)
_test_forward_unary_elemwise(_test_ceil)
_test_forward_unary_elemwise(_test_floor)
_test_forward_unary_elemwise(_test_exp)
_test_forward_unary_elemwise(_test_log)
_test_forward_unary_elemwise(_test_sin)
_test_forward_unary_elemwise(_test_cos)
_test_forward_unary_elemwise(_test_sqrt)
_test_forward_unary_elemwise(_test_rsqrt)
_test_forward_unary_elemwise(_test_neg)
# ceil and cos come with TFLite 1.14.0.post1 fbs schema
if package_version.parse(tf.VERSION) >= package_version.parse('1.14.0'):
_test_forward_unary_elemwise(_test_ceil)
_test_forward_unary_elemwise(_test_cos)

#######################################################################
# Element-wise
Expand Down

0 comments on commit e6930fa

Please sign in to comment.