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

Support 'BaseOutput' and subclasses from 'diffusers' in dynamo #111978

Closed
wants to merge 5 commits into from

Conversation

BowenBao
Copy link
Collaborator

@BowenBao BowenBao commented Oct 24, 2023

Stack from ghstack (oldest at bottom):

Extending the workarounds for transformers ModelOutput to cover diffusers BaseOutput. Together with huggingface/diffusers#5459 it should unblock export for diffusers models.

cc @voznesenskym @penguinwu @EikanWang @jgong5 @Guobing-Chen @XiaobingSuper @zhuhaozhe @blzheng @wenzhe-nrv @jiayisunx @chenyang78 @aakhundov @kadeng

@pytorch-bot
Copy link

pytorch-bot bot commented Oct 24, 2023

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/111978

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit 8362bed with merge base e36daca (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

…namo"


Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.


cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 aakhundov kadeng

[ghstack-poisoned]
BowenBao added a commit that referenced this pull request Oct 24, 2023
ghstack-source-id: 54caa08e6df8542af8316624fc05782ef73b59b2
Pull Request resolved: #111978
@BowenBao BowenBao marked this pull request as ready for review October 24, 2023 23:31
…namo"


Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.


cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 aakhundov kadeng

[ghstack-poisoned]
BowenBao added a commit that referenced this pull request Oct 26, 2023
ghstack-source-id: 0799c2f6c57688c320df0cce66a0c54c9686fb00
Pull Request resolved: #111978
@BowenBao BowenBao requested a review from jansel October 26, 2023 20:51
@BowenBao
Copy link
Collaborator Author

@jansel PTAL, thanks!

Copy link
Contributor

@jansel jansel left a comment

Choose a reason for hiding this comment

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

Tests failing?

torch/_dynamo/variables/dicts.py Outdated Show resolved Hide resolved
@BowenBao
Copy link
Collaborator Author

There are some weird segfaults happening in CI, I'm trying to debug. So far I cannot repro on my end, but it seems consistent on CI machines.

… from 'diffusers' in dynamo"


Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.


cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 aakhundov kadeng

[ghstack-poisoned]
BowenBao added a commit that referenced this pull request Oct 27, 2023
ghstack-source-id: 6548b7cd6fd1a60b65eb6bef7afd8a6c6bc0a145
Pull Request resolved: #111978
BowenBao added a commit that referenced this pull request Oct 27, 2023
ghstack-source-id: 6548b7cd6fd1a60b65eb6bef7afd8a6c6bc0a145
Pull Request resolved: #111978
@BowenBao BowenBao marked this pull request as ready for review October 28, 2023 02:18
@BowenBao BowenBao requested a review from jansel October 28, 2023 02:19
@BowenBao
Copy link
Collaborator Author

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Oct 28, 2023
@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: This PR needs a release notes: label
If your changes are user facing and intended to be a part of release notes, please use a label starting with release notes:.

If not, please add the topic: not user facing label.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "topic: not user facing"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Details for Dev Infra team Raised by workflow job

@BowenBao
Copy link
Collaborator Author

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 5ed6edfaadc17d027d4324b4a837f992c7838f3f returned non-zero exit code 1

Auto-merging torch/_dynamo/variables/dicts.py
CONFLICT (content): Merge conflict in torch/_dynamo/variables/dicts.py
error: could not apply 5ed6edfaadc... Support 'BaseOutput' and subclasses from 'diffusers' in dynamo
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Details for Dev Infra team Raised by workflow job

…namo"


Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.


cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng wenzhe-nrv jiayisunx chenyang78 aakhundov kadeng

[ghstack-poisoned]
BowenBao added a commit that referenced this pull request Oct 30, 2023
ghstack-source-id: 914e0a4c83ff2561ef36e386d39e0ab35e6a9600
Pull Request resolved: #111978
@BowenBao
Copy link
Collaborator Author

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@facebook-github-bot facebook-github-bot deleted the gh/BowenBao/308/head branch November 3, 2023 14:26
xuhancn pushed a commit to xuhancn/pytorch that referenced this pull request Nov 7, 2023
…ch#111978)

Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.

Pull Request resolved: pytorch#111978
Approved by: https://github.com/jansel
Skylion007 pushed a commit to Skylion007/pytorch that referenced this pull request Nov 14, 2023
…ch#111978)

Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.

Pull Request resolved: pytorch#111978
Approved by: https://github.com/jansel
andreigh pushed a commit to andreigh/pytorch that referenced this pull request Nov 19, 2023
…ch#111978)

Extending the workarounds for `transformers` `ModelOutput` to cover `diffusers` `BaseOutput`. Together with huggingface/diffusers#5459 it should unblock export for `diffusers` models.

Pull Request resolved: pytorch#111978
Approved by: https://github.com/jansel
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.

None yet

4 participants