iframe-proxy

a-r-r-o-w · 2023-10-02T20:50:22Z

What does this PR do?

Fixes #5257.

Please let me know if any other changes are required. Thanks!

Before submitting

This PR fixes a typo or improves the docs (you can dismiss the other checks if that's the case).
Did you read the contributor guideline?
Did you read our philosophy doc (important for complex PRs)?
Was this discussed/approved via a Github issue or the forum? Please add a link to it if that's the case.
Did you make sure to update the documentation with your changes? Here are the
documentation guidelines, and
here are tips on formatting docstrings.
Did you write any new necessary tests?

@yiyixuxu

yiyixuxu

Thanks for working on this!
Looks great!
Can you:

run make style to make sure we pass quality tests
maybe provide a simple code example to show that we can still use these 2 schedulers

a-r-r-o-w · 2023-10-04T19:04:27Z

a-r-r-o-w · 2023-10-05T13:46:32Z

Sorry about the force push 😅 Made an accidental push to the wrong branch.

yiyixuxu · 2023-10-06T10:34:01Z

@a-r-r-o-w make sure the tests pass too!

a-r-r-o-w · 2023-10-06T10:57:43Z

I'm not sure if these tests are failing due to something I've done. Could you help me out with this? The other failed tests were caused due to not running make fix-copies but that seems to be because of errant assumption to import ScoreSdeVpScheduler in diffusers/__init__.py when it wasn't there originally. Will commit the fix in a moment.

patrickvonplaten

Cool!

sayakpaul

Cool!

Wondering if we should be a bit less aggressive about the deprecation i.e., we still let people allow importing the scheduler but instead, throw a deprecation warning.

patrickvonplaten · 2023-10-13T13:58:41Z

@sayakpaul or @DN6 could you look into the failing docs error here?

sayakpaul · 2023-10-13T15:48:36Z

+        from .deprecated.scheduling_karras_ve import KarrasVeScheduler
+        from .deprecated.scheduling_sde_vp import ScoreSdeVpScheduler


https://github.com/huggingface/diffusers/actions/runs/6509446074/job/17680967513?pr=5269 tells the following:

ModuleNotFoundError: No module named 'diffusers.schedulers.deprecated'

To check this I did the following:

Cloned the PR branch and ran pip install -e . in a separate env (ensuring PT installation too).

From there in the activate env, I was able to successfully import: import diffusers.scheduler.deprecated.

This contradicts the error message we get from the CI.

from diffusers import StableDiffusionControlNetPipeline

Also works as expected.

Hmm, this seems weird... I'm on python3.11 locally and a fresh install works for me as well without any errors.

a-r-r-o-w · 2023-10-19T17:02:06Z

@sayakpaul @yiyixuxu Is there anything else I can do here? I can't seem to replicate the CI test fail...

yiyixuxu

~~looks good to me to merge :)~~

ohh actually, didn't realize the test fail is relevant here....

yiyixuxu · 2023-10-19T17:51:09Z

@DN6 do you have any idea why this is happening?

patrickvonplaten · 2023-11-07T17:27:35Z

@a-r-r-o-w, sorry that we're being a bit slow here - I think the PR is still very much relevant, should we re-open it?

a-r-r-o-w · 2023-11-07T17:40:30Z

@patrickvonplaten Oh, this was closed accidentally 😅 I was pruning all my remote branches that had been merged or had work that was covered by another contributor.

Yes, let's re-open it. Do let me know if there's anything I can do from my end, thanks!

a-r-r-o-w · 2023-11-10T07:25:51Z

Not sure why this is failing since locally, it works on python3.11 and python3.10.x. CI uses python3.8, so installing that right now to check if maybe that's the cause (highly unlikely though).

yiyixuxu · 2023-11-10T08:30:12Z

thanks for re-open this!

@patrickvonplaten is this something we can fix in the main?

patrickvonplaten · 2023-11-13T18:03:02Z

thanks for re-open this!

@patrickvonplaten is this something we can fix in the main?

Sorry I don't fully understand, what do you mean?

yiyixuxu · 2023-11-17T09:10:58Z

@patrickvonplaten can we take a look to see if it's ok now? think the test failure is not relevant

HuggingFaceDocBuilderDev · 2023-11-17T20:36:34Z

The documentation is not available anymore as the PR was closed or merged.

patrickvonplaten · 2023-11-20T11:26:31Z

We'll need to solve the merge conflict here I'm afraid

…recation

…onplaten

…onplaten Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com>

Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com>

Co-Authored-By: YiYi Xu <yixu310@gmail.com>

a-r-r-o-w · 2023-11-21T20:23:01Z

@patrickvonplaten @yiyixuxu This should be ready for merge. Had to rewrite the commit history with rebase to solve the merge conflict we had earlier, however it should still show Yiyi as the author of the commits made.

patrickvonplaten · 2023-11-27T11:32:37Z

@patrickvonplaten

* deprecated: KarrasVeScheduler, ScoreSdeVpScheduler * delete tests relevant to deprecated schedulers * chore: run make style * fix: import error caused due to incorrect _import_structure after deprecation * fix: ScoreSdeVpScheduler was not importable from diffusers * remove import added by assumption * Update src/diffusers/schedulers/__init__.py as suggested by @patrickvonplaten Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> * make it a part deprecated * Apply suggestions from code review Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> * Fix * fix * fix doc * fix doc....again....... * remove karras_ve test folder Co-Authored-By: YiYi Xu <yixu310@gmail.com> --------- Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> Co-authored-by: Sayak Paul <spsayakpaul@gmail.com> Co-authored-by: YiYi Xu <yixu310@gmail.com> Co-authored-by: yiyixuxu <yixu310@gmail,com>

@patrickvonplaten

* deprecated: KarrasVeScheduler, ScoreSdeVpScheduler * delete tests relevant to deprecated schedulers * chore: run make style * fix: import error caused due to incorrect _import_structure after deprecation * fix: ScoreSdeVpScheduler was not importable from diffusers * remove import added by assumption * Update src/diffusers/schedulers/__init__.py as suggested by @patrickvonplaten Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> * make it a part deprecated * Apply suggestions from code review Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> * Fix * fix * fix doc * fix doc....again....... * remove karras_ve test folder Co-Authored-By: YiYi Xu <yixu310@gmail.com> --------- Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com> Co-authored-by: Sayak Paul <spsayakpaul@gmail.com> Co-authored-by: YiYi Xu <yixu310@gmail.com> Co-authored-by: yiyixuxu <yixu310@gmail,com>

a-r-r-o-w changed the title ~~Remove deprecated schedulers~~ Deprecate KarrasVeScheduler and ScoreSdeVpScheduler Oct 2, 2023

yiyixuxu reviewed Oct 4, 2023

View reviewed changes

yiyixuxu reviewed Oct 5, 2023

View reviewed changes

Comment thread src/diffusers/__init__.py Outdated

a-r-r-o-w force-pushed the remove-deprecated-schedulers branch from a69b74d to 264fea5 Compare October 5, 2023 13:45

yiyixuxu requested a review from patrickvonplaten October 6, 2023 09:49

patrickvonplaten requested review from DN6 and sayakpaul October 11, 2023 11:05

patrickvonplaten reviewed Oct 11, 2023

View reviewed changes

Comment thread src/diffusers/schedulers/__init__.py Outdated

patrickvonplaten reviewed Oct 11, 2023

View reviewed changes

sayakpaul approved these changes Oct 11, 2023

View reviewed changes

sayakpaul reviewed Oct 13, 2023

View reviewed changes

yiyixuxu approved these changes Oct 19, 2023

View reviewed changes

a-r-r-o-w closed this Nov 7, 2023

a-r-r-o-w deleted the remove-deprecated-schedulers branch November 7, 2023 11:42

a-r-r-o-w restored the remove-deprecated-schedulers branch November 10, 2023 07:05

a-r-r-o-w reopened this Nov 10, 2023

a-r-r-o-w requested a review from yiyixuxu November 15, 2023 22:38

yiyixuxu reviewed Nov 17, 2023

View reviewed changes

Comment thread src/diffusers/schedulers/__init__.py Outdated

a-r-r-o-w mentioned this pull request Nov 20, 2023

[DO NOT MERGE] Test rebase for deprecated schedulers #5871

Closed

6 tasks

a-r-r-o-w and others added 13 commits November 22, 2023 01:32

deprecated: KarrasVeScheduler, ScoreSdeVpScheduler

65faa9a

delete tests relevant to deprecated schedulers

50b58dc

chore: run make style

8384a63

fix: import error caused due to incorrect _import_structure after dep…

9a9a9e2

…recation

fix: ScoreSdeVpScheduler was not importable from diffusers

d2f09c2

remove import added by assumption

02ad80c

Update src/diffusers/schedulers/__init__.py as suggested by @patrickv…

c31e0bd

…onplaten Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com>

make it a part deprecated

a1a3f0b

Apply suggestions from code review

8afed8d

Co-authored-by: Patrick von Platen <patrick.v.platen@gmail.com>

Fix

bedbdb6

fix

683da29

fix doc

ca6f292

fix doc....again.......

a8abb26

a-r-r-o-w force-pushed the remove-deprecated-schedulers branch from 16d60e4 to a8abb26 Compare November 21, 2023 20:17

remove karras_ve test folder

c483492

Co-Authored-By: YiYi Xu <yixu310@gmail.com>

patrickvonplaten merged commit 9c357bd into huggingface:main Nov 27, 2023

stevhliu mentioned this pull request Aug 20, 2026

[docs] Clean up links #14535

Merged

		from .deprecated.scheduling_karras_ve import KarrasVeScheduler
		from .deprecated.scheduling_sde_vp import ScoreSdeVpScheduler

Sunbelt Computer Software

PL/B Language Development and Support

Conversation

a-r-r-o-w commented Oct 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Before submitting

Uh oh!

yiyixuxu left a comment

Choose a reason for hiding this comment

Uh oh!

a-r-r-o-w commented Oct 4, 2023

Uh oh!

Uh oh!

a-r-r-o-w commented Oct 5, 2023

Uh oh!

yiyixuxu commented Oct 6, 2023

Uh oh!

a-r-r-o-w commented Oct 6, 2023

Uh oh!

Uh oh!

patrickvonplaten left a comment

Choose a reason for hiding this comment

Uh oh!

sayakpaul left a comment

Choose a reason for hiding this comment

Uh oh!

patrickvonplaten commented Oct 13, 2023

Uh oh!

sayakpaul Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

sayakpaul Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

a-r-r-o-w Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

a-r-r-o-w commented Oct 19, 2023

Uh oh!

yiyixuxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yiyixuxu commented Oct 19, 2023

Uh oh!

patrickvonplaten commented Nov 7, 2023

Uh oh!

a-r-r-o-w commented Nov 7, 2023

Uh oh!

a-r-r-o-w commented Nov 10, 2023

Uh oh!

yiyixuxu commented Nov 10, 2023

Uh oh!

patrickvonplaten commented Nov 13, 2023

Uh oh!

Uh oh!

yiyixuxu commented Nov 17, 2023

Uh oh!

HuggingFaceDocBuilderDev commented Nov 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

patrickvonplaten commented Nov 20, 2023

Uh oh!

a-r-r-o-w commented Nov 21, 2023

Uh oh!

patrickvonplaten commented Nov 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

a-r-r-o-w commented Oct 2, 2023 •

edited

Loading

yiyixuxu left a comment •

edited

Loading

HuggingFaceDocBuilderDev commented Nov 17, 2023 •

edited

Loading