Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
99207bc8
Commit
99207bc8
authored
Jan 19, 2023
by
EllangoK
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check model name values are set before merging
parent
bb0978ec
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
4 deletions
+18
-4
extras.py
modules/extras.py
+18
-4
No files found.
modules/extras.py
View file @
99207bc8
...
@@ -287,10 +287,19 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
...
@@ -287,10 +287,19 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
def
add_difference
(
theta0
,
theta1_2_diff
,
alpha
):
def
add_difference
(
theta0
,
theta1_2_diff
,
alpha
):
return
theta0
+
(
alpha
*
theta1_2_diff
)
return
theta0
+
(
alpha
*
theta1_2_diff
)
if
not
primary_model_name
:
shared
.
state
.
textinfo
=
"Failed: Merging requires a primary model."
shared
.
state
.
end
()
return
[
"Failed: Merging requires a primary model."
]
+
[
gr
.
Dropdown
.
update
(
choices
=
sd_models
.
checkpoint_tiles
())
for
_
in
range
(
4
)]
primary_model_info
=
sd_models
.
checkpoints_list
[
primary_model_name
]
primary_model_info
=
sd_models
.
checkpoints_list
[
primary_model_name
]
if
not
secondary_model_name
:
shared
.
state
.
textinfo
=
"Failed: Merging requires a secondary model."
shared
.
state
.
end
()
return
[
"Failed: Merging requires a secondary model."
]
+
[
gr
.
Dropdown
.
update
(
choices
=
sd_models
.
checkpoint_tiles
())
for
_
in
range
(
4
)]
secondary_model_info
=
sd_models
.
checkpoints_list
[
secondary_model_name
]
secondary_model_info
=
sd_models
.
checkpoints_list
[
secondary_model_name
]
tertiary_model_info
=
sd_models
.
checkpoints_list
.
get
(
tertiary_model_name
,
None
)
result_is_inpainting_model
=
False
theta_funcs
=
{
theta_funcs
=
{
"Weighted sum"
:
(
None
,
weighted_sum
),
"Weighted sum"
:
(
None
,
weighted_sum
),
...
@@ -298,10 +307,15 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
...
@@ -298,10 +307,15 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
}
}
theta_func1
,
theta_func2
=
theta_funcs
[
interp_method
]
theta_func1
,
theta_func2
=
theta_funcs
[
interp_method
]
if
theta_func1
and
not
tertiary_model_info
:
tertiary_model_info
=
None
if
theta_func1
and
not
tertiary_model_name
:
shared
.
state
.
textinfo
=
"Failed: Interpolation method requires a tertiary model."
shared
.
state
.
textinfo
=
"Failed: Interpolation method requires a tertiary model."
shared
.
state
.
end
()
shared
.
state
.
end
()
return
[
"Failed: Interpolation method requires a tertiary model."
]
+
[
gr
.
Dropdown
.
update
(
choices
=
sd_models
.
checkpoint_tiles
())
for
_
in
range
(
4
)]
return
[
f
"Failed: Interpolation method ({interp_method}) requires a tertiary model."
]
+
[
gr
.
Dropdown
.
update
(
choices
=
sd_models
.
checkpoint_tiles
())
for
_
in
range
(
4
)]
else
:
tertiary_model_info
=
sd_models
.
checkpoints_list
.
get
(
tertiary_model_name
,
None
)
result_is_inpainting_model
=
False
shared
.
state
.
textinfo
=
f
"Loading {secondary_model_info.filename}..."
shared
.
state
.
textinfo
=
f
"Loading {secondary_model_info.filename}..."
print
(
f
"Loading {secondary_model_info.filename}..."
)
print
(
f
"Loading {secondary_model_info.filename}..."
)
...
...
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