diff options
| author | invincibledude <> | 2023-01-21 21:08:58 +0000 |
|---|---|---|
| committer | invincibledude <> | 2023-01-21 21:08:58 +0000 |
| commit | 6cd7bf9f860dff3b61a50ec2d41915536cbcf448 (patch) | |
| tree | 01850fe297acb316e2bb883584953db65fee8ca0 | |
| parent | 3ffe2e768b542c837927cfdf0310a2e0fdd48683 (diff) | |
| download | stable-diffusion-webui-gfx803-6cd7bf9f860dff3b61a50ec2d41915536cbcf448.tar.gz stable-diffusion-webui-gfx803-6cd7bf9f860dff3b61a50ec2d41915536cbcf448.tar.bz2 stable-diffusion-webui-gfx803-6cd7bf9f860dff3b61a50ec2d41915536cbcf448.zip | |
PLMS edge-case handling fix 3
| -rw-r--r-- | modules/processing.py | 4 | ||||
| -rw-r--r-- | modules/txt2img.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/processing.py b/modules/processing.py index 83c65948..6f6efe06 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -710,7 +710,7 @@ def old_hires_fix_first_pass_dimensions(width, height): class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
sampler = None
- def __init__(self, enable_hr: bool = False, denoising_strength: float = 0.75, firstphase_width: int = 0, firstphase_height: int = 0, hr_scale: float = 2.0, hr_upscaler: str = None, hr_second_pass_steps: int = 0, hr_resize_x: int = 0, hr_resize_y: int = 0, hr_sampler: int | str = 0, **kwargs):
+ def __init__(self, enable_hr: bool = False, denoising_strength: float = 0.75, firstphase_width: int = 0, firstphase_height: int = 0, hr_scale: float = 2.0, hr_upscaler: str = None, hr_second_pass_steps: int = 0, hr_resize_x: int = 0, hr_resize_y: int = 0, hr_sampler: str = '---', **kwargs):
super().__init__(**kwargs)
self.enable_hr = enable_hr
self.denoising_strength = denoising_strength
@@ -864,7 +864,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing): img2img_sampler_name = self.sampler_name if self.sampler_name != 'PLMS' else 'DDIM' # PLMS does not support img2img so we just silently switch ot DDIM
- if self.hr_sampler == 0:
+ if self.hr_sampler == '---':
pass
elif self.hr_sampler == 'PLMS':
img2img_sampler_name = 'DDIM'
diff --git a/modules/txt2img.py b/modules/txt2img.py index 8560b74f..9c8ec621 100644 --- a/modules/txt2img.py +++ b/modules/txt2img.py @@ -39,7 +39,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step hr_resize_x=hr_resize_x,
hr_resize_y=hr_resize_y,
hr_sampler=sd_samplers.samplers[hr_sampler_index - 1].name
- if hr_sampler_index != 0 else 0
+ if hr_sampler_index != 0 else '---'
)
p.scripts = modules.scripts.scripts_txt2img
|