Skip to content

S
Stable Diffusion Webui
Commit af02ee12 authored by DepFA's avatar DepFA Committed by GitHub
Browse files
Options

Merge branch 'master' into use-typing-list

parents 34c358d1 20f8ec87
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
modules/prompt_parser.py
View file @ af02ee12
...@@ -184,7 +184,6 @@ class MulticondLearnedConditioning: ...@@ -184,7 +184,6 @@ class MulticondLearnedConditioning:
self.shape: tuple = shape # the shape field is needed to send this object to DDIM/PLMS self.shape: tuple = shape # the shape field is needed to send this object to DDIM/PLMS
self.batch: List[List[ComposableScheduledPromptConditioning]] = batch self.batch: List[List[ComposableScheduledPromptConditioning]] = batch
def get_multicond_learned_conditioning(model, prompts, steps) -> MulticondLearnedConditioning: def get_multicond_learned_conditioning(model, prompts, steps) -> MulticondLearnedConditioning:
"""same as get_learned_conditioning, but returns a list of ScheduledPromptConditioning along with the weight objects for each prompt. """same as get_learned_conditioning, but returns a list of ScheduledPromptConditioning along with the weight objects for each prompt.
For each prompt, the list is obtained by splitting the prompt using the AND separator. For each prompt, the list is obtained by splitting the prompt using the AND separator.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment