The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Lint and fix undefined names (1/N) (#6028)
Chenlei Hu2cddbf0821c0
diff --git a/comfy/gligen.py b/comfy/gligen.pyindex 592522767..161d8a5e5 100644--- a/comfy/gligen.py+++ b/comfy/gligen.py@@ -1,3 +1,4 @@+import mathimport torchfrom torch import nnfrom .ldm.modules.attention import CrossAttentiondiff --git a/comfy/ldm/audio/dit.py b/comfy/ldm/audio/dit.pyindex 3e2b4ebcb..179c5b67e 100644--- a/comfy/ldm/audio/dit.py+++ b/comfy/ldm/audio/dit.py@@ -228,9 +228,9 @@ class FeedForward(nn.Module):linear_in = GLU(dim, inner_dim, activation, dtype=dtype, device=device, operations=operations)else:linear_in = nn.Sequential(- Rearrange('b n d -> b d n') if use_conv else nn.Identity(),+ rearrange('b n d -> b d n') if use_conv else nn.Identity(),operations.Linear(dim, inner_dim, bias = not no_bias, dtype=dtype, device=device) if not use_conv else operations.Conv1d(dim, inner_dim, conv_kernel_size, padding = (conv_kernel_size // 2), bias = not no_bias, dtype=dtype, device=device),- Rearrange('b n d -> b d n') if use_conv else nn.Identity(),+ rearrange('b n d -> b d n') if use_conv else nn.Identity(),activation)@@ -245,9 +245,9 @@ class FeedForward(nn.Module):self.ff = nn.Sequential(linear_in,- Rearrange('b d n -> b n d') if use_conv else nn.Identity(),+ rearrange('b d n -> b n d') if use_conv else nn.Identity(),linear_out,- Rearrange('b n d -> b d n') if use_conv else nn.Identity(),+ rearrange('b n d -> b d n') if use_conv else nn.Identity(),)def forward(self, x):diff --git a/comfy/ldm/models/autoencoder.py b/comfy/ldm/models/autoencoder.pyindex 3b5bc0e60..6b6f0f278 100644--- a/comfy/ldm/models/autoencoder.py+++ b/comfy/ldm/models/autoencoder.py@@ -1,3 +1,5 @@+import logging+import mathimport torchfrom contextlib import contextmanagerfrom typing import Any, Dict, Tuple, Union@@ -52,7 +54,7 @@ class AbstractAutoencoder(torch.nn.Module):if self.use_ema:self.model_ema = LitEma(self, decay=ema_decay)- logpy.info(f"Keeping EMAs of {len(list(self.model_ema.buffers()))}.")+ logging.info(f"Keeping EMAs of {len(list(self.model_ema.buffers()))}.")def get_input(self, batch) -> Any:raise NotImplementedError()@@ -68,14 +70,14 @@ class AbstractAutoencoder(torch.nn.Module):self.model_ema.store(self.parameters())self.model_ema.copy_to(self)if context is not None:- logpy.info(f"{context}: Switched to EMA weights")+ logging.info(f"{context}: Switched to EMA weights")try:yield Nonefinally:if self.use_ema:self.model_ema.restore(self.parameters())if context is not None:- logpy.info(f"{context}: Restored training weights")+ logging.info(f"{context}: Restored training weights")def encode(self, *args, **kwargs) -> torch.Tensor:raise NotImplementedError("encode()-method of abstract base class called")@@ -84,7 +86,7 @@ class AbstractAutoencoder(torch.nn.Module):raise NotImplementedError("decode()-method of abstract base class called")def instantiate_optimizer_from_config(self, params, lr, cfg):- logpy.info(f"loading >>> {cfg['target']} <<< optimizer from config")+ logging.info(f"loading >>> {cfg['target']} <<< optimizer from config")return get_obj_from_str(cfg["target"])(params, lr=lr, **cfg.get("params", dict()))@@ -112,7 +114,7 @@ class AutoencodingEngine(AbstractAutoencoder):self.encoder: torch.nn.Module = instantiate_from_config(encoder_config)self.decoder: torch.nn.Module = instantiate_from_config(decoder_config)- self.regularization: AbstractRegularizer = instantiate_from_config(+ self.regularization = instantiate_from_config(regularizer_config)diff --git a/comfy/ldm/modules/diffusionmodules/mmdit.py b/comfy/ldm/modules/diffusionmodules/mmdit.pyindex 7365503f5..b052c48e0 100644--- a/comfy/ldm/modules/diffusionmodules/mmdit.py+++ b/comfy/ldm/modules/diffusionmodules/mmdit.py@@ -1,3 +1,4 @@+from functools import partialfrom typing import Dict, Optional, Listimport numpy as npdiff --git a/ruff.toml b/ruff.tomlindex 39de4d403..41d3dc5b5 100644--- a/ruff.toml+++ b/ruff.toml@@ -6,4 +6,6 @@ lint.select = ["S307", # suspicious-eval-usage"F401", # unused-import"F841", # unused-local-variable+ # TODO: Enable F821 after all errors has been fixed. Remaining errors: 7.+ # "F821", # undefined-name]\ No newline at end of file