From 8f442eba9c042bc327e819a57faa6ff9624d8f4f Mon Sep 17 00:00:00 2001 From: patrickvonplaten Date: Thu, 8 Sep 2022 22:02:51 +0200 Subject: [PATCH 1/2] Update black --- examples/textual_inversion/textual_inversion.py | 1 - setup.py | 2 +- src/diffusers/models/unet_blocks.py | 3 --- .../pipelines/latent_diffusion/pipeline_latent_diffusion.py | 1 - .../pipeline_latent_diffusion_uncond.py | 1 - src/diffusers/schedulers/scheduling_ddpm.py | 2 -- src/diffusers/schedulers/scheduling_sde_vp.py | 1 - src/diffusers/utils/logging.py | 4 ---- 8 files changed, 1 insertion(+), 14 deletions(-) diff --git a/examples/textual_inversion/textual_inversion.py b/examples/textual_inversion/textual_inversion.py index 6a9b6a237514..3ca0fd913e93 100644 --- a/examples/textual_inversion/textual_inversion.py +++ b/examples/textual_inversion/textual_inversion.py @@ -238,7 +238,6 @@ def __init__( placeholder_token="*", center_crop=False, ): - self.data_root = data_root self.tokenizer = tokenizer self.learnable_property = learnable_property diff --git a/setup.py b/setup.py index 31d0cd295356..cb972792acf7 100644 --- a/setup.py +++ b/setup.py @@ -167,7 +167,7 @@ def run(self): extras = {} -extras["quality"] = ["black==22.3", "isort>=5.5.4", "flake8>=3.8.3", "hf-doc-builder"] +extras["quality"] = ["black==22.8", "isort>=5.5.4", "flake8>=3.8.3", "hf-doc-builder"] extras["docs"] = ["hf-doc-builder"] extras["training"] = ["accelerate", "datasets", "tensorboard", "modelcards"] extras["test"] = ["datasets", "onnxruntime", "pytest", "pytest-timeout", "pytest-xdist", "scipy", "transformers"] diff --git a/src/diffusers/models/unet_blocks.py b/src/diffusers/models/unet_blocks.py index 9e062165357c..88349075d24f 100644 --- a/src/diffusers/models/unet_blocks.py +++ b/src/diffusers/models/unet_blocks.py @@ -979,7 +979,6 @@ def __init__( def forward(self, hidden_states, res_hidden_states_tuple, temb=None): for resnet, attn in zip(self.resnets, self.attentions): - # pop res hidden states res_hidden_states = res_hidden_states_tuple[-1] res_hidden_states_tuple = res_hidden_states_tuple[:-1] @@ -1075,7 +1074,6 @@ def set_attention_slice(self, slice_size): def forward(self, hidden_states, res_hidden_states_tuple, temb=None, encoder_hidden_states=None): for resnet, attn in zip(self.resnets, self.attentions): - # pop res hidden states res_hidden_states = res_hidden_states_tuple[-1] res_hidden_states_tuple = res_hidden_states_tuple[:-1] @@ -1139,7 +1137,6 @@ def __init__( def forward(self, hidden_states, res_hidden_states_tuple, temb=None): for resnet in self.resnets: - # pop res hidden states res_hidden_states = res_hidden_states_tuple[-1] res_hidden_states_tuple = res_hidden_states_tuple[:-1] diff --git a/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion.py b/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion.py index b39840f2436b..9d3be8b1ff86 100644 --- a/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion.py +++ b/src/diffusers/pipelines/latent_diffusion/pipeline_latent_diffusion.py @@ -691,7 +691,6 @@ def forward( output_hidden_states=None, return_dict=None, ): - outputs = self.model( input_ids, attention_mask=attention_mask, diff --git a/src/diffusers/pipelines/latent_diffusion_uncond/pipeline_latent_diffusion_uncond.py b/src/diffusers/pipelines/latent_diffusion_uncond/pipeline_latent_diffusion_uncond.py index 4979d88feee9..3b80b872ff72 100644 --- a/src/diffusers/pipelines/latent_diffusion_uncond/pipeline_latent_diffusion_uncond.py +++ b/src/diffusers/pipelines/latent_diffusion_uncond/pipeline_latent_diffusion_uncond.py @@ -38,7 +38,6 @@ def __call__( return_dict: bool = True, **kwargs, ) -> Union[Tuple, ImagePipelineOutput]: - r""" Args: batch_size (`int`, *optional*, defaults to 1): diff --git a/src/diffusers/schedulers/scheduling_ddpm.py b/src/diffusers/schedulers/scheduling_ddpm.py index 4fbfb9038336..020739406e71 100644 --- a/src/diffusers/schedulers/scheduling_ddpm.py +++ b/src/diffusers/schedulers/scheduling_ddpm.py @@ -94,7 +94,6 @@ def __init__( clip_sample: bool = True, tensor_format: str = "pt", ): - if trained_betas is not None: self.betas = np.asarray(trained_betas) elif beta_schedule == "linear": @@ -251,7 +250,6 @@ def add_noise( noise: Union[torch.FloatTensor, np.ndarray], timesteps: Union[torch.IntTensor, np.ndarray], ) -> Union[torch.FloatTensor, np.ndarray]: - sqrt_alpha_prod = self.alphas_cumprod[timesteps] ** 0.5 sqrt_alpha_prod = self.match_shape(sqrt_alpha_prod, original_samples) sqrt_one_minus_alpha_prod = (1 - self.alphas_cumprod[timesteps]) ** 0.5 diff --git a/src/diffusers/schedulers/scheduling_sde_vp.py b/src/diffusers/schedulers/scheduling_sde_vp.py index 66e6ec6616ab..8ada5b8c97d9 100644 --- a/src/diffusers/schedulers/scheduling_sde_vp.py +++ b/src/diffusers/schedulers/scheduling_sde_vp.py @@ -40,7 +40,6 @@ class ScoreSdeVpScheduler(SchedulerMixin, ConfigMixin): @register_to_config def __init__(self, num_train_timesteps=2000, beta_min=0.1, beta_max=20, sampling_eps=1e-3, tensor_format="np"): - self.sigmas = None self.discrete_sigmas = None self.timesteps = None diff --git a/src/diffusers/utils/logging.py b/src/diffusers/utils/logging.py index 1f2d0227b87c..7771a5a5bf7a 100644 --- a/src/diffusers/utils/logging.py +++ b/src/diffusers/utils/logging.py @@ -65,17 +65,14 @@ def _get_default_logging_level(): def _get_library_name() -> str: - return __name__.split(".")[0] def _get_library_root_logger() -> logging.Logger: - return logging.getLogger(_get_library_name()) def _configure_library_root_logger() -> None: - global _default_handler with _lock: @@ -93,7 +90,6 @@ def _configure_library_root_logger() -> None: def _reset_library_root_logger() -> None: - global _default_handler with _lock: From 8957e4f784d74392f995914e4e073a2fad13e8ce Mon Sep 17 00:00:00 2001 From: patrickvonplaten Date: Thu, 8 Sep 2022 22:05:48 +0200 Subject: [PATCH 2/2] update table --- setup.py | 2 +- src/diffusers/dependency_versions_table.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cb972792acf7..fffb8f26f09b 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ _deps = [ "Pillow", "accelerate>=0.11.0", - "black==22.3", + "black==22.8", "datasets", "filelock", "flake8>=3.8.3", diff --git a/src/diffusers/dependency_versions_table.py b/src/diffusers/dependency_versions_table.py index 74c5331e5af6..fa8ddfe0b607 100644 --- a/src/diffusers/dependency_versions_table.py +++ b/src/diffusers/dependency_versions_table.py @@ -4,7 +4,7 @@ deps = { "Pillow": "Pillow", "accelerate": "accelerate>=0.11.0", - "black": "black==22.3", + "black": "black==22.8", "datasets": "datasets", "filelock": "filelock", "flake8": "flake8>=3.8.3",