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
d4e36db6
Unverified
Commit
d4e36db6
authored
Sep 28, 2022
by
AUTOMATIC1111
Committed by
GitHub
Sep 28, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1199 from C43H66N12O12S2/k-eta
Add Eta parameter to K Ancestral samplers
parents
f2a4a2c3
047ca733
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
processing.py
modules/processing.py
+2
-2
sd_samplers.py
modules/sd_samplers.py
+4
-2
shared.py
modules/shared.py
+1
-1
No files found.
modules/processing.py
View file @
d4e36db6
...
@@ -79,7 +79,7 @@ class StableDiffusionProcessing:
...
@@ -79,7 +79,7 @@ class StableDiffusionProcessing:
self
.
color_corrections
=
None
self
.
color_corrections
=
None
self
.
denoising_strength
:
float
=
0
self
.
denoising_strength
:
float
=
0
self
.
ddim_eta
=
opts
.
ddim_
eta
self
.
eta
=
opts
.
eta
self
.
ddim_discretize
=
opts
.
ddim_discretize
self
.
ddim_discretize
=
opts
.
ddim_discretize
self
.
s_churn
=
opts
.
s_churn
self
.
s_churn
=
opts
.
s_churn
self
.
s_tmin
=
opts
.
s_tmin
self
.
s_tmin
=
opts
.
s_tmin
...
@@ -124,7 +124,7 @@ class Processed:
...
@@ -124,7 +124,7 @@ class Processed:
self
.
extra_generation_params
=
p
.
extra_generation_params
self
.
extra_generation_params
=
p
.
extra_generation_params
self
.
index_of_first_image
=
index_of_first_image
self
.
index_of_first_image
=
index_of_first_image
self
.
ddim_eta
=
p
.
ddim_
eta
self
.
eta
=
p
.
eta
self
.
ddim_discretize
=
p
.
ddim_discretize
self
.
ddim_discretize
=
p
.
ddim_discretize
self
.
s_churn
=
p
.
s_churn
self
.
s_churn
=
p
.
s_churn
self
.
s_tmin
=
p
.
s_tmin
self
.
s_tmin
=
p
.
s_tmin
...
...
modules/sd_samplers.py
View file @
d4e36db6
...
@@ -39,8 +39,10 @@ samplers_for_img2img = [x for x in samplers if x.name != 'PLMS']
...
@@ -39,8 +39,10 @@ samplers_for_img2img = [x for x in samplers if x.name != 'PLMS']
sampler_extra_params
=
{
sampler_extra_params
=
{
'sample_euler'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_euler'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_euler_ancestral'
:[
'eta'
],
'sample_heun'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_heun'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_dpm_2'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_dpm_2'
:[
's_churn'
,
's_tmin'
,
's_tmax'
,
's_noise'
],
'sample_dpm_2_ancestral'
:[
'eta'
],
}
}
def
setup_img2img_steps
(
p
,
steps
=
None
):
def
setup_img2img_steps
(
p
,
steps
=
None
):
...
@@ -154,9 +156,9 @@ class VanillaStableDiffusionSampler:
...
@@ -154,9 +156,9 @@ class VanillaStableDiffusionSampler:
# existing code fails with cetin step counts, like 9
# existing code fails with cetin step counts, like 9
try
:
try
:
samples_ddim
,
_
=
self
.
sampler
.
sample
(
S
=
steps
,
conditioning
=
conditioning
,
batch_size
=
int
(
x
.
shape
[
0
]),
shape
=
x
[
0
]
.
shape
,
verbose
=
False
,
unconditional_guidance_scale
=
p
.
cfg_scale
,
unconditional_conditioning
=
unconditional_conditioning
,
x_T
=
x
,
eta
=
p
.
ddim_
eta
)
samples_ddim
,
_
=
self
.
sampler
.
sample
(
S
=
steps
,
conditioning
=
conditioning
,
batch_size
=
int
(
x
.
shape
[
0
]),
shape
=
x
[
0
]
.
shape
,
verbose
=
False
,
unconditional_guidance_scale
=
p
.
cfg_scale
,
unconditional_conditioning
=
unconditional_conditioning
,
x_T
=
x
,
eta
=
p
.
eta
)
except
Exception
:
except
Exception
:
samples_ddim
,
_
=
self
.
sampler
.
sample
(
S
=
steps
+
1
,
conditioning
=
conditioning
,
batch_size
=
int
(
x
.
shape
[
0
]),
shape
=
x
[
0
]
.
shape
,
verbose
=
False
,
unconditional_guidance_scale
=
p
.
cfg_scale
,
unconditional_conditioning
=
unconditional_conditioning
,
x_T
=
x
,
eta
=
p
.
ddim_
eta
)
samples_ddim
,
_
=
self
.
sampler
.
sample
(
S
=
steps
+
1
,
conditioning
=
conditioning
,
batch_size
=
int
(
x
.
shape
[
0
]),
shape
=
x
[
0
]
.
shape
,
verbose
=
False
,
unconditional_guidance_scale
=
p
.
cfg_scale
,
unconditional_conditioning
=
unconditional_conditioning
,
x_T
=
x
,
eta
=
p
.
eta
)
return
samples_ddim
return
samples_ddim
...
...
modules/shared.py
View file @
d4e36db6
...
@@ -221,7 +221,7 @@ options_templates.update(options_section(('ui', "User interface"), {
...
@@ -221,7 +221,7 @@ options_templates.update(options_section(('ui', "User interface"), {
}))
}))
options_templates
.
update
(
options_section
((
'sampler-params'
,
"Sampler parameters"
),
{
options_templates
.
update
(
options_section
((
'sampler-params'
,
"Sampler parameters"
),
{
"
ddim_eta"
:
OptionInfo
(
0.0
,
"DDIM
eta"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
"
eta"
:
OptionInfo
(
0.0
,
"DDIM and K Ancestral
eta"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
"ddim_discretize"
:
OptionInfo
(
'uniform'
,
"img2img DDIM discretize"
,
gr
.
Radio
,
{
"choices"
:
[
'uniform'
,
'quad'
]}),
"ddim_discretize"
:
OptionInfo
(
'uniform'
,
"img2img DDIM discretize"
,
gr
.
Radio
,
{
"choices"
:
[
'uniform'
,
'quad'
]}),
's_churn'
:
OptionInfo
(
0.0
,
"sigma churn"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
's_churn'
:
OptionInfo
(
0.0
,
"sigma churn"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
's_tmin'
:
OptionInfo
(
0.0
,
"sigma tmin"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
's_tmin'
:
OptionInfo
(
0.0
,
"sigma tmin"
,
gr
.
Slider
,
{
"minimum"
:
0.0
,
"maximum"
:
1.0
,
"step"
:
0.01
}),
...
...
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