From 7f6702ab27eafad57150ab8d5444be12723e5cf9 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 29 Sep 2023 16:03:53 +0000 Subject: [PATCH 1/2] [PEFT warnings] Only sure deprecation warnings in the future --- src/diffusers/loaders.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/diffusers/loaders.py b/src/diffusers/loaders.py index 11e600e59884..0fba9af39c8d 100644 --- a/src/diffusers/loaders.py +++ b/src/diffusers/loaders.py @@ -48,6 +48,7 @@ set_weights_and_activate_adapters, ) from .utils.import_utils import BACKENDS_MAPPING +from . import __version__ if is_transformers_available(): @@ -1708,7 +1709,8 @@ def _remove_text_encoder_monkey_patch(self): @classmethod def _remove_text_encoder_monkey_patch_classmethod(cls, text_encoder): - deprecate("_remove_text_encoder_monkey_patch_classmethod", "0.23", LORA_DEPRECATION_MESSAGE) + if version.parse(__version__) > version.parse("0.23"): + deprecate("_remove_text_encoder_monkey_patch_classmethod", "0.25", LORA_DEPRECATION_MESSAGE) for _, attn_module in text_encoder_attn_modules(text_encoder): if isinstance(attn_module.q_proj, PatchedLoraProjection): @@ -1736,7 +1738,8 @@ def _modify_text_encoder( r""" Monkey-patches the forward passes of attention modules of the text encoder. """ - deprecate("_modify_text_encoder", "0.23", LORA_DEPRECATION_MESSAGE) + if version.parse(__version__) > version.parse("0.23"): + deprecate("_modify_text_encoder", "0.25", LORA_DEPRECATION_MESSAGE) def create_patched_linear_lora(model, network_alpha, rank, dtype, lora_parameters): linear_layer = model.regular_linear_layer if isinstance(model, PatchedLoraProjection) else model @@ -2123,7 +2126,8 @@ def fuse_text_encoder_lora(text_encoder, lora_scale=1.0): module.merge() else: - deprecate("fuse_text_encoder_lora", "0.23", LORA_DEPRECATION_MESSAGE) + if version.parse(__version__) > version.parse("0.23"): + deprecate("fuse_text_encoder_lora", "0.25", LORA_DEPRECATION_MESSAGE) def fuse_text_encoder_lora(text_encoder, lora_scale=1.0): for _, attn_module in text_encoder_attn_modules(text_encoder): @@ -2173,7 +2177,8 @@ def unfuse_text_encoder_lora(text_encoder): module.unmerge() else: - deprecate("unfuse_text_encoder_lora", "0.23", LORA_DEPRECATION_MESSAGE) + if version.parse(__version__) > version.parse("0.23"): + deprecate("unfuse_text_encoder_lora", "0.25", LORA_DEPRECATION_MESSAGE) def unfuse_text_encoder_lora(text_encoder): for _, attn_module in text_encoder_attn_modules(text_encoder): From 96360717b2b5310f57095aa0c42e1d0623fd83ff Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Fri, 29 Sep 2023 16:05:03 +0000 Subject: [PATCH 2/2] make style --- src/diffusers/loaders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffusers/loaders.py b/src/diffusers/loaders.py index 0fba9af39c8d..d0a9b3e2d382 100644 --- a/src/diffusers/loaders.py +++ b/src/diffusers/loaders.py @@ -27,6 +27,7 @@ from packaging import version from torch import nn +from . import __version__ from .models.modeling_utils import _LOW_CPU_MEM_USAGE_DEFAULT, load_model_dict_into_meta from .utils import ( DIFFUSERS_CACHE, @@ -48,7 +49,6 @@ set_weights_and_activate_adapters, ) from .utils.import_utils import BACKENDS_MAPPING -from . import __version__ if is_transformers_available():