Fix encoder-decoder ONNX merge #924
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
fxmarty
requested review from
JingyaHuang,
regisss,
michaelbenayoun,
echarlaix and
mht-sharma
|
The documentation is not available anymore as the PR was closed or merged. |
JingyaHuang
reviewed
Mar 27, 2023
| outputs_only_in_1 = model1_outputs - model2_outputs | ||
| outputs_only_in_2 = model2_outputs - model1_outputs | ||
| if len(outputs_only_in_2) > 0: | ||
| raise ValueError("The ModelProto model2 should not have more outputs than model1.") |
There was a problem hiding this comment.
Suggested change
| raise ValueError("The ModelProto model2 should not have more outputs than model1.") | |
| raise ValueError("The 2nd ModelProto should not have more outputs than 1st model.") |
There was a problem hiding this comment.
And btw why can model 1 have more outputs than model2 but not inverse?
There was a problem hiding this comment.
merge_decoders is asymmetrical for now - it was before as well as we use the outputs of model1. It's indeed not good and can be changed in an other PR.
michaelbenayoun
approved these changes
Mar 27, 2023
|
|
||
| outputs_only_in_1 = model1_outputs - model2_outputs | ||
| outputs_only_in_2 = model2_outputs - model1_outputs | ||
| if len(outputs_only_in_2) > 0: |
There was a problem hiding this comment.
Is the raw number of element check enough?
Because we could check if one is a subset of the other as well if needed?
There was a problem hiding this comment.
Thanks, fixed with set checks!
| else: | ||
| model2.graph.output.remove(model_output_2) | ||
|
|
||
| # We use model1 (normally the decoder) for the output shape |
Co-authored-by: Michael Benayoun <[email protected]>
Co-authored-by: Michael Benayoun <[email protected]>
Co-authored-by: Michael Benayoun <[email protected]>
…ptimum into fix-decoder-merge-onnx
4 tasks
This was referenced Mar 30, 2023
Closed
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.
Fixes #921
In next PRs:
optimum-cli export onnx