Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
ComfyUI
Commits
fcfd2bdf
Commit
fcfd2bdf
authored
Apr 04, 2024
by
comfyanonymous
Browse files
Small cleanup.
parent
f1175662
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
comfy/samplers.py
comfy/samplers.py
+7
-4
comfy_extras/nodes_custom_sampler.py
comfy_extras/nodes_custom_sampler.py
+1
-1
No files found.
comfy/samplers.py
View file @
fcfd2bdf
...
@@ -596,13 +596,16 @@ class CFGGuider:
...
@@ -596,13 +596,16 @@ class CFGGuider:
self
.
original_conds
=
{}
self
.
original_conds
=
{}
self
.
cfg
=
1.0
self
.
cfg
=
1.0
def
set_conds
(
self
,
conds
):
def
set_conds
(
self
,
positive
,
negative
):
for
k
in
conds
:
self
.
inner_set_conds
({
"positive"
:
positive
,
"negative"
:
negative
})
self
.
original_conds
[
k
]
=
comfy
.
sampler_helpers
.
convert_cond
(
conds
[
k
])
def
set_cfg
(
self
,
cfg
):
def
set_cfg
(
self
,
cfg
):
self
.
cfg
=
cfg
self
.
cfg
=
cfg
def
inner_set_conds
(
self
,
conds
):
for
k
in
conds
:
self
.
original_conds
[
k
]
=
comfy
.
sampler_helpers
.
convert_cond
(
conds
[
k
])
def
__call__
(
self
,
*
args
,
**
kwargs
):
def
__call__
(
self
,
*
args
,
**
kwargs
):
return
self
.
predict_noise
(
*
args
,
**
kwargs
)
return
self
.
predict_noise
(
*
args
,
**
kwargs
)
...
@@ -646,7 +649,7 @@ class CFGGuider:
...
@@ -646,7 +649,7 @@ class CFGGuider:
def
sample
(
model
,
noise
,
positive
,
negative
,
cfg
,
device
,
sampler
,
sigmas
,
model_options
=
{},
latent_image
=
None
,
denoise_mask
=
None
,
callback
=
None
,
disable_pbar
=
False
,
seed
=
None
):
def
sample
(
model
,
noise
,
positive
,
negative
,
cfg
,
device
,
sampler
,
sigmas
,
model_options
=
{},
latent_image
=
None
,
denoise_mask
=
None
,
callback
=
None
,
disable_pbar
=
False
,
seed
=
None
):
cfg_guider
=
CFGGuider
(
model
)
cfg_guider
=
CFGGuider
(
model
)
cfg_guider
.
set_conds
(
{
"positive"
:
positive
,
"
negative
"
:
negative
}
)
cfg_guider
.
set_conds
(
positive
,
negative
)
cfg_guider
.
set_cfg
(
cfg
)
cfg_guider
.
set_cfg
(
cfg
)
return
cfg_guider
.
sample
(
noise
,
latent_image
,
sampler
,
sigmas
,
denoise_mask
,
callback
,
disable_pbar
,
seed
)
return
cfg_guider
.
sample
(
noise
,
latent_image
,
sampler
,
sigmas
,
denoise_mask
,
callback
,
disable_pbar
,
seed
)
...
...
comfy_extras/nodes_custom_sampler.py
View file @
fcfd2bdf
...
@@ -397,7 +397,7 @@ class CFGGuider:
...
@@ -397,7 +397,7 @@ class CFGGuider:
def
get_guider
(
self
,
model
,
positive
,
negative
,
cfg
):
def
get_guider
(
self
,
model
,
positive
,
negative
,
cfg
):
guider
=
comfy
.
samplers
.
CFGGuider
(
model
)
guider
=
comfy
.
samplers
.
CFGGuider
(
model
)
guider
.
set_conds
(
{
"positive"
:
positive
,
"
negative
"
:
negative
}
)
guider
.
set_conds
(
positive
,
negative
)
guider
.
set_cfg
(
cfg
)
guider
.
set_cfg
(
cfg
)
return
(
guider
,)
return
(
guider
,)
...
...
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