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
b2261b53
Commit
b2261b53
authored
Oct 13, 2022
by
Buckzor
Committed by
AUTOMATIC1111
Oct 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added first_pass_width and height as adjustable inputs to "High Res Fix"
parent
9e5ca507
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
processing.py
modules/processing.py
+4
-2
txt2img.py
modules/txt2img.py
+4
-1
ui.py
modules/ui.py
+6
-0
No files found.
modules/processing.py
View file @
b2261b53
...
@@ -506,11 +506,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
...
@@ -506,11 +506,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
firstphase_width_truncated
=
0
firstphase_width_truncated
=
0
firstphase_height_truncated
=
0
firstphase_height_truncated
=
0
def
__init__
(
self
,
enable_hr
=
False
,
scale_latent
=
True
,
denoising_strength
=
0.75
,
**
kwargs
):
def
__init__
(
self
,
enable_hr
=
False
,
scale_latent
=
True
,
denoising_strength
=
0.75
,
first_pass_width
=
512
,
first_pass_height
=
512
,
**
kwargs
):
super
()
.
__init__
(
**
kwargs
)
super
()
.
__init__
(
**
kwargs
)
self
.
enable_hr
=
enable_hr
self
.
enable_hr
=
enable_hr
self
.
scale_latent
=
scale_latent
self
.
scale_latent
=
scale_latent
self
.
denoising_strength
=
denoising_strength
self
.
denoising_strength
=
denoising_strength
self
.
first_pass_width
=
first_pass_width
self
.
first_pass_height
=
first_pass_height
def
init
(
self
,
all_prompts
,
all_seeds
,
all_subseeds
):
def
init
(
self
,
all_prompts
,
all_seeds
,
all_subseeds
):
if
self
.
enable_hr
:
if
self
.
enable_hr
:
...
@@ -519,7 +521,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
...
@@ -519,7 +521,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
else
:
else
:
state
.
job_count
=
state
.
job_count
*
2
state
.
job_count
=
state
.
job_count
*
2
desired_pixel_count
=
512
*
512
desired_pixel_count
=
self
.
first_pass_width
*
self
.
first_pass_height
actual_pixel_count
=
self
.
width
*
self
.
height
actual_pixel_count
=
self
.
width
*
self
.
height
scale
=
math
.
sqrt
(
desired_pixel_count
/
actual_pixel_count
)
scale
=
math
.
sqrt
(
desired_pixel_count
/
actual_pixel_count
)
...
...
modules/txt2img.py
View file @
b2261b53
...
@@ -6,7 +6,7 @@ import modules.processing as processing
...
@@ -6,7 +6,7 @@ import modules.processing as processing
from
modules.ui
import
plaintext_to_html
from
modules.ui
import
plaintext_to_html
def
txt2img
(
prompt
:
str
,
negative_prompt
:
str
,
prompt_style
:
str
,
prompt_style2
:
str
,
steps
:
int
,
sampler_index
:
int
,
restore_faces
:
bool
,
tiling
:
bool
,
n_iter
:
int
,
batch_size
:
int
,
cfg_scale
:
float
,
seed
:
int
,
subseed
:
int
,
subseed_strength
:
float
,
seed_resize_from_h
:
int
,
seed_resize_from_w
:
int
,
seed_enable_extras
:
bool
,
height
:
int
,
width
:
int
,
enable_hr
:
bool
,
scale_latent
:
bool
,
denoising_strength
:
float
,
*
args
):
def
txt2img
(
prompt
:
str
,
negative_prompt
:
str
,
prompt_style
:
str
,
prompt_style2
:
str
,
steps
:
int
,
sampler_index
:
int
,
restore_faces
:
bool
,
tiling
:
bool
,
n_iter
:
int
,
batch_size
:
int
,
cfg_scale
:
float
,
seed
:
int
,
subseed
:
int
,
subseed_strength
:
float
,
seed_resize_from_h
:
int
,
seed_resize_from_w
:
int
,
seed_enable_extras
:
bool
,
height
:
int
,
width
:
int
,
enable_hr
:
bool
,
scale_latent
:
bool
,
denoising_strength
:
float
,
first_pass_width
:
int
,
first_pass_height
:
int
,
*
args
):
p
=
StableDiffusionProcessingTxt2Img
(
p
=
StableDiffusionProcessingTxt2Img
(
sd_model
=
shared
.
sd_model
,
sd_model
=
shared
.
sd_model
,
outpath_samples
=
opts
.
outdir_samples
or
opts
.
outdir_txt2img_samples
,
outpath_samples
=
opts
.
outdir_samples
or
opts
.
outdir_txt2img_samples
,
...
@@ -32,6 +32,9 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
...
@@ -32,6 +32,9 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
enable_hr
=
enable_hr
,
enable_hr
=
enable_hr
,
scale_latent
=
scale_latent
if
enable_hr
else
None
,
scale_latent
=
scale_latent
if
enable_hr
else
None
,
denoising_strength
=
denoising_strength
if
enable_hr
else
None
,
denoising_strength
=
denoising_strength
if
enable_hr
else
None
,
first_pass_width
=
first_pass_width
if
enable_hr
else
None
,
first_pass_height
=
first_pass_height
if
enable_hr
else
None
,
)
)
if
cmd_opts
.
enable_console_prompts
:
if
cmd_opts
.
enable_console_prompts
:
...
...
modules/ui.py
View file @
b2261b53
...
@@ -540,6 +540,8 @@ def create_ui(wrap_gradio_gpu_call):
...
@@ -540,6 +540,8 @@ def create_ui(wrap_gradio_gpu_call):
enable_hr
=
gr
.
Checkbox
(
label
=
'Highres. fix'
,
value
=
False
)
enable_hr
=
gr
.
Checkbox
(
label
=
'Highres. fix'
,
value
=
False
)
with
gr
.
Row
(
visible
=
False
)
as
hr_options
:
with
gr
.
Row
(
visible
=
False
)
as
hr_options
:
first_pass_width
=
gr
.
Slider
(
minimum
=
64
,
maximum
=
1024
,
step
=
64
,
label
=
"First pass width"
,
value
=
512
)
first_pass_height
=
gr
.
Slider
(
minimum
=
64
,
maximum
=
1024
,
step
=
64
,
label
=
"First pass height"
,
value
=
512
)
scale_latent
=
gr
.
Checkbox
(
label
=
'Scale latent'
,
value
=
False
)
scale_latent
=
gr
.
Checkbox
(
label
=
'Scale latent'
,
value
=
False
)
denoising_strength
=
gr
.
Slider
(
minimum
=
0.0
,
maximum
=
1.0
,
step
=
0.01
,
label
=
'Denoising strength'
,
value
=
0.7
)
denoising_strength
=
gr
.
Slider
(
minimum
=
0.0
,
maximum
=
1.0
,
step
=
0.01
,
label
=
'Denoising strength'
,
value
=
0.7
)
...
@@ -604,6 +606,8 @@ def create_ui(wrap_gradio_gpu_call):
...
@@ -604,6 +606,8 @@ def create_ui(wrap_gradio_gpu_call):
enable_hr
,
enable_hr
,
scale_latent
,
scale_latent
,
denoising_strength
,
denoising_strength
,
first_pass_width
,
first_pass_height
,
]
+
custom_inputs
,
]
+
custom_inputs
,
outputs
=
[
outputs
=
[
txt2img_gallery
,
txt2img_gallery
,
...
@@ -668,6 +672,8 @@ def create_ui(wrap_gradio_gpu_call):
...
@@ -668,6 +672,8 @@ def create_ui(wrap_gradio_gpu_call):
(
denoising_strength
,
"Denoising strength"
),
(
denoising_strength
,
"Denoising strength"
),
(
enable_hr
,
lambda
d
:
"Denoising strength"
in
d
),
(
enable_hr
,
lambda
d
:
"Denoising strength"
in
d
),
(
hr_options
,
lambda
d
:
gr
.
Row
.
update
(
visible
=
"Denoising strength"
in
d
)),
(
hr_options
,
lambda
d
:
gr
.
Row
.
update
(
visible
=
"Denoising strength"
in
d
)),
(
first_pass_width
,
"First pass width"
),
(
first_pass_height
,
"First pass height"
),
]
]
modules
.
generation_parameters_copypaste
.
connect_paste
(
paste
,
txt2img_paste_fields
,
txt2img_prompt
)
modules
.
generation_parameters_copypaste
.
connect_paste
(
paste
,
txt2img_paste_fields
,
txt2img_prompt
)
token_button
.
click
(
fn
=
update_token_counter
,
inputs
=
[
txt2img_prompt
,
steps
],
outputs
=
[
token_counter
])
token_button
.
click
(
fn
=
update_token_counter
,
inputs
=
[
txt2img_prompt
,
steps
],
outputs
=
[
token_counter
])
...
...
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