diff options
| author | DepFA <35278260+dfaker@users.noreply.github.com> | 2022-10-05 22:02:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 22:02:45 +0000 |
| commit | af02ee1297b212e053c0f44bd457e90b7ed49eb9 (patch) | |
| tree | 7130c35d90ba9fb50d8488e0a530872f89cb4283 /modules/prompt_parser.py | |
| parent | 34c358d10d52817f7a889ae4c52096ee654f3fe6 (diff) | |
| parent | 20f8ec877a99ce2ebf193cb1e2e773cfc77b7c41 (diff) | |
| download | stable-diffusion-webui-gfx803-af02ee1297b212e053c0f44bd457e90b7ed49eb9.tar.gz stable-diffusion-webui-gfx803-af02ee1297b212e053c0f44bd457e90b7ed49eb9.tar.bz2 stable-diffusion-webui-gfx803-af02ee1297b212e053c0f44bd457e90b7ed49eb9.zip | |
Merge branch 'master' into use-typing-list
Diffstat (limited to 'modules/prompt_parser.py')
| -rw-r--r-- | modules/prompt_parser.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index fdfa21ae..a7a6aa31 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -184,7 +184,6 @@ class MulticondLearnedConditioning: self.shape: tuple = shape # the shape field is needed to send this object to DDIM/PLMS
self.batch: List[List[ComposableScheduledPromptConditioning]] = batch
-
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.
For each prompt, the list is obtained by splitting the prompt using the AND separator.
|