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
03e57088
Commit
03e57088
authored
Oct 09, 2022
by
frostydad
Committed by
AUTOMATIC1111
Oct 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect sampler name in output
parent
122d4268
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
processing.py
modules/processing.py
+8
-1
xy_grid.py
scripts/xy_grid.py
+9
-7
No files found.
modules/processing.py
View file @
03e57088
import
json
import
json
import
math
import
math
import
os
import
os
...
@@ -46,6 +47,12 @@ def apply_color_correction(correction, image):
...
@@ -46,6 +47,12 @@ def apply_color_correction(correction, image):
return
image
return
image
def
get_correct_sampler
(
p
):
if
isinstance
(
p
,
modules
.
processing
.
StableDiffusionProcessingTxt2Img
):
return
sd_samplers
.
samplers
elif
isinstance
(
p
,
modules
.
processing
.
StableDiffusionProcessingImg2Img
):
return
sd_samplers
.
samplers_for_img2img
class
StableDiffusionProcessing
:
class
StableDiffusionProcessing
:
def
__init__
(
self
,
sd_model
=
None
,
outpath_samples
=
None
,
outpath_grids
=
None
,
prompt
=
""
,
styles
=
None
,
seed
=-
1
,
subseed
=-
1
,
subseed_strength
=
0
,
seed_resize_from_h
=-
1
,
seed_resize_from_w
=-
1
,
seed_enable_extras
=
True
,
sampler_index
=
0
,
batch_size
=
1
,
n_iter
=
1
,
steps
=
50
,
cfg_scale
=
7.0
,
width
=
512
,
height
=
512
,
restore_faces
=
False
,
tiling
=
False
,
do_not_save_samples
=
False
,
do_not_save_grid
=
False
,
extra_generation_params
=
None
,
overlay_images
=
None
,
negative_prompt
=
None
,
eta
=
None
):
def
__init__
(
self
,
sd_model
=
None
,
outpath_samples
=
None
,
outpath_grids
=
None
,
prompt
=
""
,
styles
=
None
,
seed
=-
1
,
subseed
=-
1
,
subseed_strength
=
0
,
seed_resize_from_h
=-
1
,
seed_resize_from_w
=-
1
,
seed_enable_extras
=
True
,
sampler_index
=
0
,
batch_size
=
1
,
n_iter
=
1
,
steps
=
50
,
cfg_scale
=
7.0
,
width
=
512
,
height
=
512
,
restore_faces
=
False
,
tiling
=
False
,
do_not_save_samples
=
False
,
do_not_save_grid
=
False
,
extra_generation_params
=
None
,
overlay_images
=
None
,
negative_prompt
=
None
,
eta
=
None
):
self
.
sd_model
=
sd_model
self
.
sd_model
=
sd_model
...
@@ -272,7 +279,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
...
@@ -272,7 +279,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
generation_params
=
{
generation_params
=
{
"Steps"
:
p
.
steps
,
"Steps"
:
p
.
steps
,
"Sampler"
:
sd_samplers
.
samplers
[
p
.
sampler_index
]
.
name
,
"Sampler"
:
get_correct_sampler
(
p
)
[
p
.
sampler_index
]
.
name
,
"CFG scale"
:
p
.
cfg_scale
,
"CFG scale"
:
p
.
cfg_scale
,
"Seed"
:
all_seeds
[
index
],
"Seed"
:
all_seeds
[
index
],
"Face restoration"
:
(
opts
.
face_restoration_model
if
p
.
restore_faces
else
None
),
"Face restoration"
:
(
opts
.
face_restoration_model
if
p
.
restore_faces
else
None
),
...
...
scripts/xy_grid.py
View file @
03e57088
...
@@ -11,7 +11,7 @@ import modules.scripts as scripts
...
@@ -11,7 +11,7 @@ import modules.scripts as scripts
import
gradio
as
gr
import
gradio
as
gr
from
modules
import
images
from
modules
import
images
from
modules.processing
import
process_images
,
Processed
from
modules.processing
import
process_images
,
Processed
,
get_correct_sampler
from
modules.shared
import
opts
,
cmd_opts
,
state
from
modules.shared
import
opts
,
cmd_opts
,
state
import
modules.shared
as
shared
import
modules.shared
as
shared
import
modules.sd_samplers
import
modules.sd_samplers
...
@@ -56,15 +56,17 @@ def apply_order(p, x, xs):
...
@@ -56,15 +56,17 @@ def apply_order(p, x, xs):
p
.
prompt
=
prompt_tmp
+
p
.
prompt
p
.
prompt
=
prompt_tmp
+
p
.
prompt
samplers_dict
=
{}
def
build_samplers_dict
(
p
):
for
i
,
sampler
in
enumerate
(
modules
.
sd_samplers
.
samplers
):
samplers_dict
=
{}
samplers_dict
[
sampler
.
name
.
lower
()]
=
i
for
i
,
sampler
in
enumerate
(
get_correct_sampler
(
p
)):
for
alias
in
sampler
.
aliases
:
samplers_dict
[
sampler
.
name
.
lower
()]
=
i
samplers_dict
[
alias
.
lower
()]
=
i
for
alias
in
sampler
.
aliases
:
samplers_dict
[
alias
.
lower
()]
=
i
return
samplers_dict
def
apply_sampler
(
p
,
x
,
xs
):
def
apply_sampler
(
p
,
x
,
xs
):
sampler_index
=
samplers_dict
.
get
(
x
.
lower
(),
None
)
sampler_index
=
build_samplers_dict
(
p
)
.
get
(
x
.
lower
(),
None
)
if
sampler_index
is
None
:
if
sampler_index
is
None
:
raise
RuntimeError
(
f
"Unknown sampler: {x}"
)
raise
RuntimeError
(
f
"Unknown sampler: {x}"
)
...
...
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