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
37c9073f
Unverified
Commit
37c9073f
authored
Oct 01, 2022
by
RnDMonkey
Committed by
GitHub
Oct 01, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'AUTOMATIC1111:master' into trunk
parents
f6a97868
3f417566
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
processing.py
modules/processing.py
+2
-2
sd_samplers.py
modules/sd_samplers.py
+8
-2
No files found.
modules/processing.py
View file @
37c9073f
...
@@ -79,7 +79,7 @@ class StableDiffusionProcessing:
...
@@ -79,7 +79,7 @@ class StableDiffusionProcessing:
self
.
paste_to
=
None
self
.
paste_to
=
None
self
.
color_corrections
=
None
self
.
color_corrections
=
None
self
.
denoising_strength
:
float
=
0
self
.
denoising_strength
:
float
=
0
self
.
sampler_noise_scheduler_override
=
None
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
...
@@ -130,7 +130,7 @@ class Processed:
...
@@ -130,7 +130,7 @@ class Processed:
self
.
s_tmin
=
p
.
s_tmin
self
.
s_tmin
=
p
.
s_tmin
self
.
s_tmax
=
p
.
s_tmax
self
.
s_tmax
=
p
.
s_tmax
self
.
s_noise
=
p
.
s_noise
self
.
s_noise
=
p
.
s_noise
self
.
sampler_noise_scheduler_override
=
p
.
sampler_noise_scheduler_override
self
.
prompt
=
self
.
prompt
if
type
(
self
.
prompt
)
!=
list
else
self
.
prompt
[
0
]
self
.
prompt
=
self
.
prompt
if
type
(
self
.
prompt
)
!=
list
else
self
.
prompt
[
0
]
self
.
negative_prompt
=
self
.
negative_prompt
if
type
(
self
.
negative_prompt
)
!=
list
else
self
.
negative_prompt
[
0
]
self
.
negative_prompt
=
self
.
negative_prompt
if
type
(
self
.
negative_prompt
)
!=
list
else
self
.
negative_prompt
[
0
]
self
.
seed
=
int
(
self
.
seed
if
type
(
self
.
seed
)
!=
list
else
self
.
seed
[
0
])
self
.
seed
=
int
(
self
.
seed
if
type
(
self
.
seed
)
!=
list
else
self
.
seed
[
0
])
...
...
modules/sd_samplers.py
View file @
37c9073f
...
@@ -290,7 +290,10 @@ class KDiffusionSampler:
...
@@ -290,7 +290,10 @@ class KDiffusionSampler:
def
sample_img2img
(
self
,
p
,
x
,
noise
,
conditioning
,
unconditional_conditioning
,
steps
=
None
):
def
sample_img2img
(
self
,
p
,
x
,
noise
,
conditioning
,
unconditional_conditioning
,
steps
=
None
):
steps
,
t_enc
=
setup_img2img_steps
(
p
,
steps
)
steps
,
t_enc
=
setup_img2img_steps
(
p
,
steps
)
sigmas
=
self
.
model_wrap
.
get_sigmas
(
steps
)
if
p
.
sampler_noise_scheduler_override
:
sigmas
=
p
.
sampler_noise_scheduler_override
(
steps
)
else
:
sigmas
=
self
.
model_wrap
.
get_sigmas
(
steps
)
noise
=
noise
*
sigmas
[
steps
-
t_enc
-
1
]
noise
=
noise
*
sigmas
[
steps
-
t_enc
-
1
]
xi
=
x
+
noise
xi
=
x
+
noise
...
@@ -306,7 +309,10 @@ class KDiffusionSampler:
...
@@ -306,7 +309,10 @@ class KDiffusionSampler:
def
sample
(
self
,
p
,
x
,
conditioning
,
unconditional_conditioning
,
steps
=
None
):
def
sample
(
self
,
p
,
x
,
conditioning
,
unconditional_conditioning
,
steps
=
None
):
steps
=
steps
or
p
.
steps
steps
=
steps
or
p
.
steps
sigmas
=
self
.
model_wrap
.
get_sigmas
(
steps
)
if
p
.
sampler_noise_scheduler_override
:
sigmas
=
p
.
sampler_noise_scheduler_override
(
steps
)
else
:
sigmas
=
self
.
model_wrap
.
get_sigmas
(
steps
)
x
=
x
*
sigmas
[
0
]
x
=
x
*
sigmas
[
0
]
extra_params_kwargs
=
self
.
initialize
(
p
)
extra_params_kwargs
=
self
.
initialize
(
p
)
...
...
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