soaska/my-sd
soaska/my-sd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

fix tile-colorfix problems

Browse Source 
This will completely solve problems related to tile-colorfix and now tile colorfix/colorfix+sharp give same results to webui-cn
This commit is contained in:
lllyasviel 2024-02-14 02:19:04 -08:00
parent b50d978e1b
commit fa8be06613
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions-builtin/forge_legacy_preprocessors/legacy_preprocessors/preprocessor_compiled.py
View File

@ -615,7 +615,8 @@ legacy_preprocessors = {
"priority": 100,
"tags": [
"MLSD"
]
],
"use_soft_projection_in_hr_fix": True
},
# "normal_bae": {
# "label": "normal_bae",

3
extensions-builtin/forge_legacy_preprocessors/scripts/legacy_preprocessors.py
View File

@ -59,6 +59,9 @@ class LegacyPreprocessor(Preprocessor):
'instant-iD': ['instant_id', 'instantid'],
}
if legacy_dict.get('use_soft_projection_in_hr_fix', False):
self.use_soft_projection_in_hr_fix = True
self.model_filename_filters = []
for tag in self.tags:
tag_lower = tag.lower()

7
extensions-builtin/sd_forge_controlnet/scripts/controlnet.py
View File

@ -467,8 +467,11 @@ class ControlNetForForgeOfficial(scripts.Script):
params.model.positive_advanced_weighting = soft_weighting.copy()
params.model.negative_advanced_weighting = zero_weighting.copy()
# high-ref fix pass always use softer injections
if is_hr_pass or unit.control_mode == external_code.ControlMode.PROMPT.value:
if unit.control_mode == external_code.ControlMode.PROMPT.value:
params.model.positive_advanced_weighting = soft_weighting.copy()
params.model.negative_advanced_weighting = soft_weighting.copy()
if is_hr_pass and params.preprocessor.use_soft_projection_in_hr_fix:
params.model.positive_advanced_weighting = soft_weighting.copy()
params.model.negative_advanced_weighting = soft_weighting.copy()

2
modules_forge/supported_preprocessor.py
View File

@ -32,6 +32,7 @@ class Preprocessor:
self.sorting_priority = 0 # higher goes to top in the list
self.corp_image_with_a1111_mask_when_in_img2img_inpaint_tab = True
self.fill_mask_with_one_when_resize_and_fill = False
self.use_soft_projection_in_hr_fix = False
def setup_model_patcher(self, model, load_device=None, offload_device=None, dtype=torch.float32, **kwargs):
if load_device is None:
@ -86,6 +87,7 @@ class PreprocessorCanny(Preprocessor):
self.slider_1 = PreprocessorParameter(minimum=0, maximum=256, step=1, value=100, label='Low Threshold', visible=True)
self.slider_2 = PreprocessorParameter(minimum=0, maximum=256, step=1, value=200, label='High Threshold', visible=True)
self.sorting_priority = 100
self.use_soft_projection_in_hr_fix = True
def __call__(self, input_image, resolution, slider_1=None, slider_2=None, slider_3=None, **kwargs):
input_image, remove_pad = resize_image_with_pad(input_image, resolution)