[QNN] Support CallNode inputs in qnn.concatenate #5360
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anijain2305
approved these changes
Apr 17, 2020
|
I would suggest we add a unit test for this case. |
|
Is there somewhere that QnnCanonicalize is tested where I can add a test? |
|
You can add it here - tests/python/relay/test_op_qnn_concatenate.py |
|
I'm finding it difficult to test this case because in the Python API for qnn.concatenate the data value is expected to be a tuple (not a tuple-type call). Do you think it makes sense to relax this requirement in the Python API and let it fail in C++ instead? |
mbaret
force-pushed
the
concat-fix
branch
2 times, most recently
from
467346f
to
9567256
Compare
|
@anijain2305 @zhiics could you take a look at the changes I've made and see if this is now OK? |
anijain2305
approved these changes
Apr 29, 2020
zhiics
reviewed
Apr 29, 2020
Currently, qnn.concatenate assumes that its 1st arg (data) is a TupleNode. This may not necessarily be true if the input is a CallNode which returns a value of tuple-type. This patch handles the CallNode case by inserting TupleGetItemNodes.
Change-Id: I731a231113c5214528373ef52b603a9f05ec502a
Change-Id: Ib3495532f6e4feb5aae3d3096cedd4dc4676cdb4
Change-Id: Id8123ea2dd9ce3d8267609de7b5602bb84b084fb
|
@zhiics @anijain2305 could you take another look at this please? |
zhiics
reviewed
May 1, 2020
trevor-m
pushed a commit
to trevor-m/tvm
that referenced
this pull request
Jun 9, 2020
* [QNN] Support CallNode inputs in qnn.concatenate Currently, qnn.concatenate assumes that its 1st arg (data) is a TupleNode. This may not necessarily be true if the input is a CallNode which returns a value of tuple-type. This patch handles the CallNode case by inserting TupleGetItemNodes. * Fix lint * Add test Change-Id: I40b55517b8b1dabbeca89337f80c0c8e62e34981 * Use isinstance Change-Id: I731a231113c5214528373ef52b603a9f05ec502a * isinstance fix Change-Id: Ib3495532f6e4feb5aae3d3096cedd4dc4676cdb4 * Use elif/else if Change-Id: Id8123ea2dd9ce3d8267609de7b5602bb84b084fb * Fix lint Change-Id: Ib6899bb22260575aa3f5d8b51b5d2a0277ee2b10 * Lint fix Change-Id: I56cf1930315344e42d956818a6c68e80836ae786 * Spaces Change-Id: I3edab192e32bafa9ffdc915315791c63279d85dc
trevor-m
pushed a commit
to trevor-m/tvm
that referenced
this pull request
Jun 18, 2020
* [QNN] Support CallNode inputs in qnn.concatenate Currently, qnn.concatenate assumes that its 1st arg (data) is a TupleNode. This may not necessarily be true if the input is a CallNode which returns a value of tuple-type. This patch handles the CallNode case by inserting TupleGetItemNodes. * Fix lint * Add test Change-Id: I40b55517b8b1dabbeca89337f80c0c8e62e34981 * Use isinstance Change-Id: I731a231113c5214528373ef52b603a9f05ec502a * isinstance fix Change-Id: Ib3495532f6e4feb5aae3d3096cedd4dc4676cdb4 * Use elif/else if Change-Id: Id8123ea2dd9ce3d8267609de7b5602bb84b084fb * Fix lint Change-Id: Ib6899bb22260575aa3f5d8b51b5d2a0277ee2b10 * Lint fix Change-Id: I56cf1930315344e42d956818a6c68e80836ae786 * Spaces Change-Id: I3edab192e32bafa9ffdc915315791c63279d85dc
trevor-m
pushed a commit
to neo-ai/tvm
that referenced
this pull request
Jun 18, 2020
* [QNN] Support CallNode inputs in qnn.concatenate Currently, qnn.concatenate assumes that its 1st arg (data) is a TupleNode. This may not necessarily be true if the input is a CallNode which returns a value of tuple-type. This patch handles the CallNode case by inserting TupleGetItemNodes. * Fix lint * Add test Change-Id: I40b55517b8b1dabbeca89337f80c0c8e62e34981 * Use isinstance Change-Id: I731a231113c5214528373ef52b603a9f05ec502a * isinstance fix Change-Id: Ib3495532f6e4feb5aae3d3096cedd4dc4676cdb4 * Use elif/else if Change-Id: Id8123ea2dd9ce3d8267609de7b5602bb84b084fb * Fix lint Change-Id: Ib6899bb22260575aa3f5d8b51b5d2a0277ee2b10 * Lint fix Change-Id: I56cf1930315344e42d956818a6c68e80836ae786 * Spaces Change-Id: I3edab192e32bafa9ffdc915315791c63279d85dc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, qnn.concatenate assumes that its 1st arg (data) is a TupleNode. This may not necessarily be true if the input is a CallNode which returns a value of tuple-type. This patch handles the CallNode case by inserting TupleGetItemNodes.