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

[Relay][Frontend][TF] Fix transpose when axes is not a param #4327

Merged
merged 3 commits into from
Nov 15, 2019
Merged

[Relay][Frontend][TF] Fix transpose when axes is not a param #4327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e937a80
[Relay][Frontend][TF] Use _infer_value_simulated when axes is not a c…
jonso4 Nov 13, 2019
5f8d8ca
uncomment tests
jonso4 Nov 13, 2019
d32bac3
dummy change to retrigger ci
jonso4 Nov 14, 2019
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
4 changes: 2 additions & 2 deletions python/tvm/relay/frontend/tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,8 +1039,8 @@ def _impl(inputs, attr, params):
# otherwise its value is get from params
try:
axes = _get_list_param(params, inputs[1])
except (IndexError, KeyError):
axes = None
except (IndexError, KeyError, AttributeError):
axes = _infer_value_simulated(inputs[1], params).asnumpy()
return _op.transpose(inputs[0], axes=axes)
return _impl

Expand Down
18 changes: 18 additions & 0 deletions tests/python/frontend/tensorflow/test_forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,22 @@ def _test_forward_transpose(ishape, axes=None):

compare_tf_with_tvm(data, 'transpose_data:0', 'transpose:0')

def _test_forward_tranapose_axes_input(ishape, axes):
data = np.random.uniform(size=ishape).astype(np.float32)
axes_np = np.array(axes).astype(np.int32)

with tf.Graph().as_default():
in1 = tf.placeholder(
shape=data.shape, dtype=data.dtype, name="transpose_data")

const1 = tf.constant(axes_np, dtype=tf.int32)

# make axes an input to tf.transpose, but not an input to the graph,
# so it can be extracted with infer_value_simulated
axes = tf.reverse(const1, axis=[-1])
tf.transpose(in1, axes)

compare_tf_with_tvm([data], ['transpose_data:0'], 'transpose:0')

def test_forward_transpose():
_test_forward_transpose((2, 3, 4), (1, 2, 0))
Expand All @@ -2122,6 +2138,8 @@ def test_forward_transpose():
_test_forward_transpose((2, 3, 4), (1, 2, 0))
_test_forward_transpose((2, 3, 4), (0, 1, 2))
_test_forward_transpose((2, 3, 4, 5), (3, 0, 1, 2))
_test_forward_tranapose_axes_input((2, 3, 4), (1, 2, 0))
_test_forward_tranapose_axes_input((2, 3, 4, 5), (3, 0, 1, 2))


def test_forward_ceil():
Expand Down