Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
ComfyUI
Commits
51581dbf
Commit
51581dbf
authored
Jun 20, 2023
by
comfyanonymous
Browse files
Fix last commits causing an issue with the text encoder lora.
parent
bf3f2717
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
comfy/sd.py
comfy/sd.py
+6
-5
comfy_extras/nodes_model_merging.py
comfy_extras/nodes_model_merging.py
+2
-2
No files found.
comfy/sd.py
View file @
51581dbf
...
...
@@ -357,11 +357,12 @@ class ModelPatcher:
self
.
patches
+=
[(
strength_patch
,
p
,
strength_model
)]
return
p
.
keys
()
def
model_state_dict
(
self
):
def
model_state_dict
(
self
,
filter_prefix
=
None
):
sd
=
self
.
model
.
state_dict
()
keys
=
list
(
sd
.
keys
())
if
filter_prefix
is
not
None
:
for
k
in
keys
:
if
not
k
.
startswith
(
"diffusion_model."
):
if
not
k
.
startswith
(
filter_prefix
):
sd
.
pop
(
k
)
return
sd
...
...
@@ -443,7 +444,7 @@ class ModelPatcher:
weight
+=
(
alpha
*
m1
*
m2
).
reshape
(
weight
.
shape
).
type
(
weight
.
dtype
).
to
(
weight
.
device
)
return
self
.
model
def
unpatch_model
(
self
):
model_sd
=
self
.
model
.
state_dict
()
model_sd
=
self
.
model
_
state_dict
()
keys
=
list
(
self
.
backup
.
keys
())
for
k
in
keys
:
model_sd
[
k
][:]
=
self
.
backup
[
k
]
...
...
comfy_extras/nodes_model_merging.py
View file @
51581dbf
...
...
@@ -14,7 +14,7 @@ class ModelMergeSimple:
def
merge
(
self
,
model1
,
model2
,
ratio
):
m
=
model1
.
clone
()
sd
=
model2
.
model_state_dict
()
sd
=
model2
.
model_state_dict
(
"diffusion_model."
)
for
k
in
sd
:
m
.
add_patches
({
k
:
(
sd
[
k
],
)},
1.0
-
ratio
,
ratio
)
return
(
m
,
)
...
...
@@ -35,7 +35,7 @@ class ModelMergeBlocks:
def
merge
(
self
,
model1
,
model2
,
**
kwargs
):
m
=
model1
.
clone
()
sd
=
model2
.
model_state_dict
()
sd
=
model2
.
model_state_dict
(
"diffusion_model."
)
default_ratio
=
next
(
iter
(
kwargs
.
values
()))
for
k
in
sd
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment