1580158
/
sd-webui-controlnet
mirror of https://github.com/Mikubill/sd-webui-controlnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Mikubill:main' into for-video-loopback

pull/57/head
fishslot 2023-02-15 00:43:56 +08:00 committed by GitHub
parent c1ecaa8d2b 0f200f1958
commit f9e2832fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/controlnet.py
View File

@ -109,14 +109,14 @@ class Script(scripts.Script):
self.preprocessor = { self.preprocessor = {
"none": lambda x: x, "none": lambda x: x,
"canny": canny, "canny": canny,
"depth": midas,
"hed": hed, "hed": hed,
"midas": midas,
"mlsd": mlsd, "mlsd": mlsd,
"normal_map": midas_normal,
"openpose": openpose, "openpose": openpose,
"openpose_hand": openpose_hand, "openpose_hand": openpose_hand,
"segmentation": uniformer,
"normal_map": midas_normal,
"fake_scribble": fake_scribble, "fake_scribble": fake_scribble,
"segmentation": uniformer,
} }
self.input_image = None self.input_image = None
self.latest_model_hash = "" self.latest_model_hash = ""
@ -195,7 +195,7 @@ class Script(scripts.Script):
return ctrls return ctrls
def set_infotext_fields(self, p, params): def set_infotext_fields(self, p, params, weight):
module, model = params module, model = params
if model == "None" or model == "none": if model == "None" or model == "none":
return return
@ -203,7 +203,7 @@ class Script(scripts.Script):
"ControlNet Enabled": True, "ControlNet Enabled": True,
f"ControlNet Module": module, f"ControlNet Module": module,
f"ControlNet Model": model, f"ControlNet Model": model,
# f"ControlNet Weight": weight, f"ControlNet Weight": weight,
}) })
def process(self, p, *args): def process(self, p, *args):
@ -307,7 +307,7 @@ class Script(scripts.Script):
# control = torch.stack([control for _ in range(bsz)], dim=0) # control = torch.stack([control for _ in range(bsz)], dim=0)
self.latest_network.notify(control, weight) self.latest_network.notify(control, weight)
self.set_infotext_fields(p, self.latest_params) self.set_infotext_fields(p, self.latest_params, weight)
def postprocess(self, p, processed, *args): def postprocess(self, p, processed, *args):
if self.latest_network is None: if self.latest_network is None: