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.

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

[FRONTEND][TENSORFLOW] Enhance with left over patches from NNVM. #2757

Merged
merged 4 commits into from
Mar 19, 2019

Conversation

srkreddy1238
Copy link
Contributor

@srkreddy1238 srkreddy1238 commented Mar 9, 2019

commit 76188a4
Author: Siva [email protected]
[NNVM][TENSORFLOW] bugfix. (#2444)

commit 6737739
Author: Ashutosh Parkhi [email protected]
[Tensorflow] Support for Crop (#2285)

commit f6c3f99
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Use input shapes directly instead of 1-element lists (#2242)

commit e5d92e1
Author: Dominic Symes [email protected]
[FRONTEND][TENSORFLOW] Bugfix (#2326)

commit 00d509d
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Support Unstack and Split (#2105)

commit df9d3ad
Author: Siva [email protected]
[FRONTEND][TENSORFLOW] Bugfix (#2267)

commit d1a0c90
Author: Zhebin Jin [email protected]
[FRONTEND][TENSORFLOW]Add Split and realdiv op support (#2123)
* Add Split and realdiv op support
* Fix the pad calculation in the case of dilated convolution

Thanks for contributing to TVM! Please refer to guideline https://docs.tvm.ai/contribute/ for useful information and tips. After the pull request is submitted, please request code reviews from Reviewers.

@tqchen
Copy link
Member

tqchen commented Mar 9, 2019

@kazum @Huyuwei please review this PR

@srkreddy1238
Copy link
Contributor Author

Also @yongwww & @ashutoshparkhi welcome to review

commit 76188a4
Author: Siva [email protected]
[NNVM][TENSORFLOW] bugfix. (apache#2444)

commit 6737739
Author: Ashutosh Parkhi [email protected]
[Tensorflow] Support for Crop (apache#2285)

commit f6c3f99
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Use input shapes directly instead of 1-element lists (apache#2242)

commit e5d92e1
Author: Dominic Symes [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2326)

commit 00d509d
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Support Unstack and Split (apache#2105)

commit df9d3ad
Author: Siva [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2267)

commit d1a0c90
Author: Zhebin Jin [email protected]
[FRONTEND][TENSORFLOW]Add Split and realdiv op support (apache#2123)
* Add Split and realdiv op support
* Fix the pad calculation in the case of dilated convolution
nnvm/tests/python/frontend/tensorflow/test_forward.py Outdated Show resolved Hide resolved
python/tvm/relay/frontend/tensorflow.py Outdated Show resolved Hide resolved
python/tvm/relay/frontend/tensorflow.py Outdated Show resolved Hide resolved
Copy link
Contributor

@kazum kazum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks!

@@ -1267,15 +1369,22 @@ def from_tensorflow(self, graph, layout="NHWC", shape=None, outputs=None):
elif shape and node.name in shape:
# Give priority to user argument.
self._output_shapes[node.name] = [shape[node.name]]
elif node.op == 'Placeholder':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the change here was merged with pr #2493. It is okay to ignore the following three commits since #2493 was merged.

commit f347b52
Author: Yong Wu [email protected]
Get tags of saved model automatically

commit 916576c
Author: Zhi Chen [email protected]
Support TensorFlow saved model
TF parser: return the consistent error message to error handler

commit f1782f3
Author: Yong Wu [email protected]
Add tf parser wrapper, infer shape automatically

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. Removed now.

@tqchen
Copy link
Member

tqchen commented Mar 14, 2019

Copy link
Member

@yongwww yongwww left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the work!

@srkreddy1238 srkreddy1238 merged commit bb3c815 into apache:master Mar 19, 2019
wweic pushed a commit to wweic/tvm that referenced this pull request Mar 20, 2019
…che#2757)

* [FRONTEND][TENSORFLOW] Enhance with left over patches from NNVM.

commit 76188a4
Author: Siva [email protected]
[NNVM][TENSORFLOW] bugfix. (apache#2444)

commit 6737739
Author: Ashutosh Parkhi [email protected]
[Tensorflow] Support for Crop (apache#2285)

commit f6c3f99
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Use input shapes directly instead of 1-element lists (apache#2242)

commit e5d92e1
Author: Dominic Symes [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2326)

commit 00d509d
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Support Unstack and Split (apache#2105)

commit df9d3ad
Author: Siva [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2267)

commit d1a0c90
Author: Zhebin Jin [email protected]
[FRONTEND][TENSORFLOW]Add Split and realdiv op support (apache#2123)
* Add Split and realdiv op support
* Fix the pad calculation in the case of dilated convolution

* 	* review comments

* 	* resnet fix.

* 	* review comments
# This means the node is 1d in Relay and 0d in TF.
# See `_expand_dims_0d_aware`.
if self._outputs_are_0d[node_name][tensor_slot] and input_shape:
input_0d_mismatch.add(in_sym)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be in_sym[tensor_slot]?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think tensor_slot us already handled above.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my variant of inception_v3, in_sym comes as a list of Var instead of _expr.TupleWrapper.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ashutoshparkhi will fix it in pr #2830

wweic pushed a commit to neo-ai/tvm that referenced this pull request Mar 20, 2019
…che#2757)

* [FRONTEND][TENSORFLOW] Enhance with left over patches from NNVM.

commit 76188a4
Author: Siva [email protected]
[NNVM][TENSORFLOW] bugfix. (apache#2444)

commit 6737739
Author: Ashutosh Parkhi [email protected]
[Tensorflow] Support for Crop (apache#2285)

commit f6c3f99
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Use input shapes directly instead of 1-element lists (apache#2242)

commit e5d92e1
Author: Dominic Symes [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2326)

commit 00d509d
Author: Alexey Romanov [email protected]
[FRONTEND][TENSORFLOW] Support Unstack and Split (apache#2105)

commit df9d3ad
Author: Siva [email protected]
[FRONTEND][TENSORFLOW] Bugfix (apache#2267)

commit d1a0c90
Author: Zhebin Jin [email protected]
[FRONTEND][TENSORFLOW]Add Split and realdiv op support (apache#2123)
* Add Split and realdiv op support
* Fix the pad calculation in the case of dilated convolution

* 	* review comments

* 	* resnet fix.

* 	* review comments
@srkreddy1238 srkreddy1238 deleted the tf-rebase branch January 24, 2020 04:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants