Merge branch 'comfyanonymous:master' into master

This commit is contained in:
patientx 2025-06-06 17:10:34 +03:00 committed by GitHub
commit d28b4525b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -390,8 +390,9 @@ class ControlLora(ControlNet):
pass pass
for k in self.control_weights: for k in self.control_weights:
if k not in {"lora_controlnet"}: if (k not in {"lora_controlnet"}):
comfy.utils.set_attr_param(self.control_model, k, self.control_weights[k].to(dtype).to(comfy.model_management.get_torch_device())) if (k.endswith(".up") or k.endswith(".down") or k.endswith(".weight") or k.endswith(".bias")) and ("__" not in k):
comfy.utils.set_attr_param(self.control_model, k, self.control_weights[k].to(dtype).to(comfy.model_management.get_torch_device()))
def copy(self): def copy(self):
c = ControlLora(self.control_weights, global_average_pooling=self.global_average_pooling) c = ControlLora(self.control_weights, global_average_pooling=self.global_average_pooling)