Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
af416a2d
Commit
af416a2d
authored
Mar 11, 2023
by
AUTOMATIC1111
Committed by
GitHub
Mar 11, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8064 from laksjdjf/master
Add cond and uncond hidden states to CFGDenoiserParams
parents
2b0ef2c4
534cf60a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
modules/script_callbacks.py
modules/script_callbacks.py
+7
-1
modules/sd_samplers_kdiffusion.py
modules/sd_samplers_kdiffusion.py
+3
-1
No files found.
modules/script_callbacks.py
View file @
af416a2d
...
@@ -29,7 +29,7 @@ class ImageSaveParams:
...
@@ -29,7 +29,7 @@ class ImageSaveParams:
class
CFGDenoiserParams
:
class
CFGDenoiserParams
:
def
__init__
(
self
,
x
,
image_cond
,
sigma
,
sampling_step
,
total_sampling_steps
):
def
__init__
(
self
,
x
,
image_cond
,
sigma
,
sampling_step
,
total_sampling_steps
,
tensor
,
uncond
):
self
.
x
=
x
self
.
x
=
x
"""Latent image representation in the process of being denoised"""
"""Latent image representation in the process of being denoised"""
...
@@ -45,6 +45,12 @@ class CFGDenoiserParams:
...
@@ -45,6 +45,12 @@ class CFGDenoiserParams:
self
.
total_sampling_steps
=
total_sampling_steps
self
.
total_sampling_steps
=
total_sampling_steps
"""Total number of sampling steps planned"""
"""Total number of sampling steps planned"""
self
.
tensor
=
tensor
""" Encoder hidden states of conditioning"""
self
.
uncond
=
uncond
""" Encoder hidden states of unconditioning"""
class
CFGDenoisedParams
:
class
CFGDenoisedParams
:
def
__init__
(
self
,
x
,
sampling_step
,
total_sampling_steps
):
def
__init__
(
self
,
x
,
sampling_step
,
total_sampling_steps
):
...
...
modules/sd_samplers_kdiffusion.py
View file @
af416a2d
...
@@ -101,11 +101,13 @@ class CFGDenoiser(torch.nn.Module):
...
@@ -101,11 +101,13 @@ class CFGDenoiser(torch.nn.Module):
sigma_in
=
torch
.
cat
([
torch
.
stack
([
sigma
[
i
]
for
_
in
range
(
n
)])
for
i
,
n
in
enumerate
(
repeats
)]
+
[
sigma
]
+
[
sigma
])
sigma_in
=
torch
.
cat
([
torch
.
stack
([
sigma
[
i
]
for
_
in
range
(
n
)])
for
i
,
n
in
enumerate
(
repeats
)]
+
[
sigma
]
+
[
sigma
])
image_cond_in
=
torch
.
cat
([
torch
.
stack
([
image_cond
[
i
]
for
_
in
range
(
n
)])
for
i
,
n
in
enumerate
(
repeats
)]
+
[
image_cond
]
+
[
torch
.
zeros_like
(
self
.
init_latent
)])
image_cond_in
=
torch
.
cat
([
torch
.
stack
([
image_cond
[
i
]
for
_
in
range
(
n
)])
for
i
,
n
in
enumerate
(
repeats
)]
+
[
image_cond
]
+
[
torch
.
zeros_like
(
self
.
init_latent
)])
denoiser_params
=
CFGDenoiserParams
(
x_in
,
image_cond_in
,
sigma_in
,
state
.
sampling_step
,
state
.
sampling_steps
)
denoiser_params
=
CFGDenoiserParams
(
x_in
,
image_cond_in
,
sigma_in
,
state
.
sampling_step
,
state
.
sampling_steps
,
tensor
,
uncond
)
cfg_denoiser_callback
(
denoiser_params
)
cfg_denoiser_callback
(
denoiser_params
)
x_in
=
denoiser_params
.
x
x_in
=
denoiser_params
.
x
image_cond_in
=
denoiser_params
.
image_cond
image_cond_in
=
denoiser_params
.
image_cond
sigma_in
=
denoiser_params
.
sigma
sigma_in
=
denoiser_params
.
sigma
tensor
=
denoiser_params
.
tensor
uncond
=
denoiser_params
.
uncond
if
tensor
.
shape
[
1
]
==
uncond
.
shape
[
1
]:
if
tensor
.
shape
[
1
]
==
uncond
.
shape
[
1
]:
if
not
is_edit_model
:
if
not
is_edit_model
:
...
...
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