Commit 9bd2c7b4 by Ina Dobreva Committed by Yao Wang

[Bugfix][Frontend][TF] Fix incorrect calculations in tf SLICE (#4518)

* fix formula for calculating end indices when size[i] == -1
* add a test case for size[i] == -1
* discard expanding dimension of begin_value & end_value since
  it is needed only if you pass them as scalars not as tensors.
* discard 'slice_tensor' variable so that implementation matches
  the tf parser pattern
parent 26621257
...@@ -789,7 +789,7 @@ def _slice(): ...@@ -789,7 +789,7 @@ def _slice():
end = size end = size
for i in range(data_dim): for i in range(data_dim):
if size[i] == -1: if size[i] == -1:
end[i] = data_shape[i] - begin[i] end[i] = data_shape[i]
else: else:
end[i] += begin[i] end[i] += begin[i]
return _op.strided_slice(inputs[0], begin=begin, end=end) return _op.strided_slice(inputs[0], begin=begin, end=end)
......
...@@ -2344,14 +2344,15 @@ def _test_forward_slice_operation_input(input_value, begin_value, size_value): ...@@ -2344,14 +2344,15 @@ def _test_forward_slice_operation_input(input_value, begin_value, size_value):
with tf.Graph().as_default(): with tf.Graph().as_default():
input_tensor = tf.placeholder( input_tensor = tf.placeholder(
shape=input_data.shape, dtype=input_data.dtype, name="input") shape=input_data.shape, dtype=input_data.dtype, name="input")
begin_tensor = tf.expand_dims(begin_value, axis=0) tf.slice(input_tensor, begin_value, size_value, name='slice_output')
size_tensor = tf.expand_dims(size_value, axis=0)
slice_tensor = tf.slice(input_tensor, begin_tensor, size_tensor, name='slice_output')
compare_tf_with_tvm([input_data], ['input:0'], 'slice_output:0') compare_tf_with_tvm([input_data], ['input:0'], 'slice_output:0')
def test_forward_slice(): def test_forward_slice():
_test_forward_slice_operation_input([1, 1], 0, 2) _test_forward_slice_operation_input([1, 1], [0], [2])
_test_forward_slice_operation_input([0, 1, 2, 3], [3], [-1])
_test_forward_slice_operation_input([[0, 1, 2, 3], [4, 5, 6, 7]],
begin_value=[0, 1], size_value=[-1, -1])
def test_forward_ceil(): def test_forward_ceil():
ishape = (1, 3, 10, 10) ishape = (1, 3, 10, 10)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment