diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-17 06:26:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 06:26:26 +0000 |
| commit | 85232a5b26666854deae59cf950f744740dd5c37 (patch) | |
| tree | 3af76d8c6ba3173ffd925336d902da058df4e02d /modules/extras.py | |
| parent | 56a2672831751480f94a018f861f0143a8234ae8 (diff) | |
| parent | 4b07f2f584596604c4499efb0b0295e96985080f (diff) | |
| download | stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.tar.gz stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.tar.bz2 stable-diffusion-webui-gfx803-85232a5b26666854deae59cf950f744740dd5c37.zip | |
Merge branch 'dev' into taesd-a
Diffstat (limited to 'modules/extras.py')
| -rw-r--r-- | modules/extras.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/extras.py b/modules/extras.py index ff4e9c4e..bdf9b3b7 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -136,14 +136,14 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_ result_is_instruct_pix2pix_model = False
if theta_func2:
- shared.state.textinfo = f"Loading B"
+ shared.state.textinfo = "Loading B"
print(f"Loading {secondary_model_info.filename}...")
theta_1 = sd_models.read_state_dict(secondary_model_info.filename, map_location='cpu')
else:
theta_1 = None
if theta_func1:
- shared.state.textinfo = f"Loading C"
+ shared.state.textinfo = "Loading C"
print(f"Loading {tertiary_model_info.filename}...")
theta_2 = sd_models.read_state_dict(tertiary_model_info.filename, map_location='cpu')
@@ -199,7 +199,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_ result_is_inpainting_model = True
else:
theta_0[key] = theta_func2(a, b, multiplier)
-
+
theta_0[key] = to_half(theta_0[key], save_as_half)
shared.state.sampling_step += 1
|