Fix unknown scheduler error handling in calculate_sigmas function #6280
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
Modernize calculate_sigmas function
blepping
changed the title
comfyanonymous
added
the
Run-CI-Test
|
(Automated Bot Message) CI Tests are running, you can view the results at https://ci.comfy.org/?branch=6280%2Fmerge |
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.
calculate_sigmascurrently doesn't handle unknown scheduler names correctly. The variablesigmasnever gets bound in the error case, so it will fail with a rather unintuitiveNameError: name 'sigmas' is not defined.This pull modernizes
calculate_sigmasand scheduler lookup to use a dictionary for the scheduler list and adds type annotations. Of course it also fixes the original issue by raisingValueErrorafter the log message. Changes tested to be compatible with Python 3.8.Taking this approach also has the advantage of not having to repeat/keep the list of scheduler names in sync (since it can just be generated from the list keys) and reduces duplicated code. Also, custom nodes can easily add themselves to the scheduler list without having to do stuff like monkeypatch
calculate_sigmas.It could be changed to just use a simple tuple if desired, but
NamedTupleis a lot more readable.I've been using this myself for a while without any issues but more testing would definitely be good. (I don't see an obvious way it would cause a problem though.)