Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Frontend][TFLite] Fix tests for tflite unary elemwise operations #4913

Merged
merged 1 commit into from
Feb 21, 2020
Merged

[Frontend][TFLite] Fix tests for tflite unary elemwise operations #4913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion python/tvm/relay/frontend/tflite.py
View file
Open in desktop
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
View file
Open in desktop
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