mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-01-23 04:40:15 +08:00
fix model upscaler, fix list iteration linting issue, fix samplers
This commit is contained in:
parent
834cf42a24
commit
752caf013c
@ -138,7 +138,6 @@ class ModelManageable(Protocol, metaclass=ABCMeta):
|
|||||||
def force_cast_weights(self) -> bool:
|
def force_cast_weights(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def prepare_hook_patches_current_keyframe(self, t, hook_group, model_options):
|
def prepare_hook_patches_current_keyframe(self, t, hook_group, model_options):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ def _comfy_entrypoint_upstream_v3_imports(module) -> ExportedNodes:
|
|||||||
if not isinstance(extension, ComfyExtension):
|
if not isinstance(extension, ComfyExtension):
|
||||||
logger.debug(f"comfy_entrypoint in {module} did not return a ComfyExtension, skipping.")
|
logger.debug(f"comfy_entrypoint in {module} did not return a ComfyExtension, skipping.")
|
||||||
else:
|
else:
|
||||||
node_list = AsyncToSyncConverter.run_async_in_thread(extension.get_node_list)
|
node_list: list = list(AsyncToSyncConverter.run_async_in_thread(extension.get_node_list))
|
||||||
if not isinstance(node_list, list):
|
if not isinstance(node_list, list):
|
||||||
logger.debug(f"comfy_entrypoint in {module} did not return a list of nodes, skipping.")
|
logger.debug(f"comfy_entrypoint in {module} did not return a list of nodes, skipping.")
|
||||||
else:
|
else:
|
||||||
|
|||||||
@ -25,6 +25,7 @@ from .model_patcher import ModelPatcher
|
|||||||
from .sampler_names import SCHEDULER_NAMES, SAMPLER_NAMES
|
from .sampler_names import SCHEDULER_NAMES, SAMPLER_NAMES
|
||||||
from .context_windows import ContextHandlerABC
|
from .context_windows import ContextHandlerABC
|
||||||
from .utils import common_upscale
|
from .utils import common_upscale
|
||||||
|
from .patcher_extension import WrapperExecutor, get_all_wrappers, WrappersMP
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -998,10 +999,10 @@ class CFGGuider:
|
|||||||
return self.outer_predict_noise(*args, **kwargs)
|
return self.outer_predict_noise(*args, **kwargs)
|
||||||
|
|
||||||
def outer_predict_noise(self, x, timestep, model_options={}, seed=None):
|
def outer_predict_noise(self, x, timestep, model_options={}, seed=None):
|
||||||
return comfy.patcher_extension.WrapperExecutor.new_class_executor(
|
return WrapperExecutor.new_class_executor(
|
||||||
self.predict_noise,
|
self.predict_noise,
|
||||||
self,
|
self,
|
||||||
comfy.patcher_extension.get_all_wrappers(comfy.patcher_extension.WrappersMP.PREDICT_NOISE, self.model_options, is_model_options=True)
|
get_all_wrappers(WrappersMP.PREDICT_NOISE, self.model_options, is_model_options=True)
|
||||||
).execute(x, timestep, model_options, seed)
|
).execute(x, timestep, model_options, seed)
|
||||||
|
|
||||||
def predict_noise(self, x, timestep, model_options={}, seed=None):
|
def predict_noise(self, x, timestep, model_options={}, seed=None):
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import av
|
|||||||
import numpy as np
|
import numpy as np
|
||||||
import torch
|
import torch
|
||||||
try:
|
try:
|
||||||
import torchaudio
|
import torchaudio # pylint: disable=import-error
|
||||||
TORCH_AUDIO_AVAILABLE = True
|
TORCH_AUDIO_AVAILABLE = True
|
||||||
except:
|
except:
|
||||||
TORCH_AUDIO_AVAILABLE = False
|
TORCH_AUDIO_AVAILABLE = False
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user