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
9be0d1b8
Commit
9be0d1b8
authored
Sep 28, 2022
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
aea5b251
e22ea454
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
extras.py
modules/extras.py
+7
-0
ui.py
modules/ui.py
+1
-1
No files found.
modules/extras.py
View file @
9be0d1b8
...
@@ -150,6 +150,12 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
...
@@ -150,6 +150,12 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
alpha
=
alpha
*
alpha
*
(
3
-
(
2
*
alpha
))
alpha
=
alpha
*
alpha
*
(
3
-
(
2
*
alpha
))
return
theta0
+
((
theta1
-
theta0
)
*
alpha
)
return
theta0
+
((
theta1
-
theta0
)
*
alpha
)
# Inverse Smoothstep (https://en.wikipedia.org/wiki/Smoothstep)
def
inv_sigmoid
(
theta0
,
theta1
,
alpha
):
import
math
alpha
=
0.5
-
math
.
sin
(
math
.
asin
(
1.0
-
2.0
*
alpha
)
/
3.0
)
return
theta0
+
((
theta1
-
theta0
)
*
alpha
)
if
os
.
path
.
exists
(
primary_model_name
):
if
os
.
path
.
exists
(
primary_model_name
):
primary_model_filename
=
primary_model_name
primary_model_filename
=
primary_model_name
primary_model_name
=
os
.
path
.
splitext
(
os
.
path
.
basename
(
primary_model_name
))[
0
]
primary_model_name
=
os
.
path
.
splitext
(
os
.
path
.
basename
(
primary_model_name
))[
0
]
...
@@ -174,6 +180,7 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
...
@@ -174,6 +180,7 @@ def run_modelmerger(primary_model_name, secondary_model_name, interp_method, int
theta_funcs
=
{
theta_funcs
=
{
"Weighted Sum"
:
weighted_sum
,
"Weighted Sum"
:
weighted_sum
,
"Sigmoid"
:
sigmoid
,
"Sigmoid"
:
sigmoid
,
"Inverse Sigmoid"
:
inv_sigmoid
}
}
theta_func
=
theta_funcs
[
interp_method
]
theta_func
=
theta_funcs
[
interp_method
]
...
...
modules/ui.py
View file @
9be0d1b8
...
@@ -868,7 +868,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
...
@@ -868,7 +868,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
primary_model_name
=
gr
.
Dropdown
(
ckpt_name_list
,
elem_id
=
"modelmerger_primary_model_name"
,
label
=
"Primary Model Name"
)
primary_model_name
=
gr
.
Dropdown
(
ckpt_name_list
,
elem_id
=
"modelmerger_primary_model_name"
,
label
=
"Primary Model Name"
)
secondary_model_name
=
gr
.
Dropdown
(
ckpt_name_list
,
elem_id
=
"modelmerger_secondary_model_name"
,
label
=
"Secondary Model Name"
)
secondary_model_name
=
gr
.
Dropdown
(
ckpt_name_list
,
elem_id
=
"modelmerger_secondary_model_name"
,
label
=
"Secondary Model Name"
)
interp_amount
=
gr
.
Slider
(
minimum
=
0.0
,
maximum
=
1.0
,
step
=
0.05
,
label
=
'Interpolation Amount'
,
value
=
0.3
)
interp_amount
=
gr
.
Slider
(
minimum
=
0.0
,
maximum
=
1.0
,
step
=
0.05
,
label
=
'Interpolation Amount'
,
value
=
0.3
)
interp_method
=
gr
.
Radio
(
choices
=
[
"Weighted Sum"
,
"Sigmoid"
],
value
=
"Weighted Sum"
,
label
=
"Interpolation Method"
)
interp_method
=
gr
.
Radio
(
choices
=
[
"Weighted Sum"
,
"Sigmoid"
,
"Inverse Sigmoid"
],
value
=
"Weighted Sum"
,
label
=
"Interpolation Method"
)
submit
=
gr
.
Button
(
elem_id
=
"modelmerger_merge"
,
label
=
"Merge"
,
variant
=
'primary'
)
submit
=
gr
.
Button
(
elem_id
=
"modelmerger_merge"
,
label
=
"Merge"
,
variant
=
'primary'
)
with
gr
.
Column
(
variant
=
'panel'
):
with
gr
.
Column
(
variant
=
'panel'
):
...
...
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