diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-30 15:22:50 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-30 15:22:50 +0000 |
| commit | ae0b2cc1964486ba847290ad752d9a284b6d63ba (patch) | |
| tree | b33b2d49646b0565b0812985d48d23fc0a2ab71d /modules/processing.py | |
| parent | 0ff8b8fb54ef5ef3994f1244efef0a50a4490628 (diff) | |
| download | stable-diffusion-webui-gfx803-ae0b2cc1964486ba847290ad752d9a284b6d63ba.tar.gz stable-diffusion-webui-gfx803-ae0b2cc1964486ba847290ad752d9a284b6d63ba.tar.bz2 stable-diffusion-webui-gfx803-ae0b2cc1964486ba847290ad752d9a284b6d63ba.zip | |
add an option to choose how to combine hires fix and refiner
Diffstat (limited to 'modules/processing.py')
| -rw-r--r-- | modules/processing.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/modules/processing.py b/modules/processing.py index 0138e5ac..f696e925 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -1148,18 +1148,12 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing): else:
decoded_samples = None
- current = shared.sd_model.sd_checkpoint_info
- try:
- if self.hr_checkpoint_info is not None:
- self.sampler = None
- sd_models.reload_model_weights(info=self.hr_checkpoint_info)
- devices.torch_gc()
-
- return self.sample_hr_pass(samples, decoded_samples, seeds, subseeds, subseed_strength, prompts)
- finally:
- self.sampler = None
- sd_models.reload_model_weights(info=current)
- devices.torch_gc()
+ with sd_models.SkipWritingToConfig():
+ sd_models.reload_model_weights(info=self.hr_checkpoint_info)
+
+ devices.torch_gc()
+
+ return self.sample_hr_pass(samples, decoded_samples, seeds, subseeds, subseed_strength, prompts)
def sample_hr_pass(self, samples, decoded_samples, seeds, subseeds, subseed_strength, prompts):
if shared.state.interrupted:
|