wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-28 15:20:25 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix linting issues, improve HooksSupport dummy implementation

Browse Source
This commit is contained in:
doctorpangloss 2025-09-09 13:26:46 -07:00
parent f5e29f0e61
commit 4f6f3e9197
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comfy/ldm/modules/sage_attention_dispatcher.py
View File

@ -2,7 +2,7 @@ from typing import Optional, Any
import torch import torch
# only imported when sage attention is enabled # only imported when sage attention is enabled
from sageattention import * # pylint: disable=import-error from sageattention import sageattn_qk_int8_pv_fp16_cuda, sageattn_qk_int8_pv_fp8_cuda, sageattn_qk_int8_pv_fp8_cuda_sm90 # pylint: disable=import-error
def get_cuda_arch_versions(): def get_cuda_arch_versions():

15
comfy/model_management_types.py
View File

@ -44,7 +44,6 @@ class HooksSupport(Protocol, metaclass=ABCMeta):
setattr(self, "_hook_mode", EnumHookMode.MaxSpeed) setattr(self, "_hook_mode", EnumHookMode.MaxSpeed)
return getattr(self, "_hook_mode") return getattr(self, "_hook_mode")
@hook_mode.setter @hook_mode.setter
def hook_mode(self, value): def hook_mode(self, value):
setattr(self, "_hook_mode", value) setattr(self, "_hook_mode", value)
@ -76,9 +75,12 @@ class HooksSupport(Protocol, metaclass=ABCMeta):
pass pass
def pre_run(self): def pre_run(self):
from .model_base import BaseModel if hasattr(self, "model"):
if hasattr(self, "model") and isinstance(self.model, BaseModel): model = getattr(self, "model")
self.model.current_patcher = self from .model_base import BaseModel
if isinstance(model, BaseModel) or hasattr(model, "current_patcher") and isinstance(self, ModelManageable):
model.current_patcher = self
def prepare_state(self, *args, **kwargs): def prepare_state(self, *args, **kwargs):
pass pass
@ -107,7 +109,7 @@ class ModelManageableExtras(Protocol, metaclass=ABCMeta):
return torch.device("cpu") return torch.device("cpu")
class ModelManageableRequired(Protocol): class ModelManageableRequired(Protocol, metaclass=ABCMeta):
""" """
The bare minimum that must be implemented to support model management when inheriting from ModelManageable The bare minimum that must be implemented to support model management when inheriting from ModelManageable
@ -122,6 +124,7 @@ class ModelManageableRequired(Protocol):
offload_device: torch.device offload_device: torch.device
model: torch.nn.Module model: torch.nn.Module
@abstractmethod
def patch_model(self, device_to: torch.device | None = None, lowvram_model_memory: int = 0, load_weights: bool = True, force_patch_weights: bool = False) -> torch.nn.Module: def patch_model(self, device_to: torch.device | None = None, lowvram_model_memory: int = 0, load_weights: bool = True, force_patch_weights: bool = False) -> torch.nn.Module:
""" """
Called by ModelManageable Called by ModelManageable
@ -138,6 +141,7 @@ class ModelManageableRequired(Protocol):
""" """
... ...
@abstractmethod
def unpatch_model(self, device_to: torch.device | None = None, unpatch_weights: Optional[bool] = False) -> torch.nn.Module: def unpatch_model(self, device_to: torch.device | None = None, unpatch_weights: Optional[bool] = False) -> torch.nn.Module:
""" """
Called by ModelManageable Called by ModelManageable
@ -152,6 +156,7 @@ class ModelManageableRequired(Protocol):
... ...
@runtime_checkable
class ModelManageable(ModelManageableRequired, ModelManageableExtras, Protocol, metaclass=ABCMeta): class ModelManageable(ModelManageableRequired, ModelManageableExtras, Protocol, metaclass=ABCMeta):
""" """
Objects which implement this protocol can be managed by Objects which implement this protocol can be managed by