From 5f73c5d1de3b73ff2589e580879066db880e4f35 Mon Sep 17 00:00:00 2001 From: CyberVy <72680847+CyberVy@users.noreply.github.com> Date: Mon, 3 Mar 2025 20:34:15 +0800 Subject: [PATCH 1/6] Update ip_adapter.py --- src/diffusers/loaders/ip_adapter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index 33144090cbc6..7e9cb4b91ad4 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -215,7 +215,8 @@ def load_ip_adapter( low_cpu_mem_usage=low_cpu_mem_usage, cache_dir=cache_dir, local_files_only=local_files_only, - ).to(self.device, dtype=self.dtype) + torch_dtype=self.dtype, + ).to(self.device) self.register_modules(image_encoder=image_encoder) else: raise ValueError( From 919ca6ca5bcf74ac95bda41e73e99328c2797943 Mon Sep 17 00:00:00 2001 From: CyberVy <72680847+CyberVy@users.noreply.github.com> Date: Mon, 3 Mar 2025 23:49:47 +0800 Subject: [PATCH 2/6] Update ip_adapter.py --- src/diffusers/loaders/ip_adapter.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index 7e9cb4b91ad4..89d53f3a00c4 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -527,8 +527,9 @@ def load_ip_adapter( low_cpu_mem_usage=low_cpu_mem_usage, cache_dir=cache_dir, local_files_only=local_files_only, + dtype=image_encoder_dtype ) - .to(self.device, dtype=image_encoder_dtype) + .to(self.device) .eval() ) self.register_modules(image_encoder=image_encoder) @@ -800,14 +801,15 @@ def load_ip_adapter( "low_cpu_mem_usage": low_cpu_mem_usage, "cache_dir": cache_dir, "local_files_only": local_files_only, + "torch_dtype": self.dtype } self.register_modules( feature_extractor=SiglipImageProcessor.from_pretrained(image_encoder_subfolder, **kwargs).to( - self.device, dtype=self.dtype + self.device ), image_encoder=SiglipVisionModel.from_pretrained(image_encoder_subfolder, **kwargs).to( - self.device, dtype=self.dtype + self.device ), ) else: From 2bf087d080d8bdfa7bc08d619fa03c00a3e99e44 Mon Sep 17 00:00:00 2001 From: CyberVy <72680847+CyberVy@users.noreply.github.com> Date: Tue, 4 Mar 2025 00:05:17 +0800 Subject: [PATCH 3/6] Update ip_adapter.py --- src/diffusers/loaders/ip_adapter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index 89d53f3a00c4..34c553778700 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -801,14 +801,13 @@ def load_ip_adapter( "low_cpu_mem_usage": low_cpu_mem_usage, "cache_dir": cache_dir, "local_files_only": local_files_only, - "torch_dtype": self.dtype } self.register_modules( feature_extractor=SiglipImageProcessor.from_pretrained(image_encoder_subfolder, **kwargs).to( self.device ), - image_encoder=SiglipVisionModel.from_pretrained(image_encoder_subfolder, **kwargs).to( + image_encoder=SiglipVisionModel.from_pretrained(image_encoder_subfolder, torch_dtype=self.dtype, **kwargs).to( self.device ), ) From 598957ae3a875badd466fd3a5ef0fa9e777cf240 Mon Sep 17 00:00:00 2001 From: CyberVy <72680847+CyberVy@users.noreply.github.com> Date: Tue, 4 Mar 2025 00:08:00 +0800 Subject: [PATCH 4/6] Update ip_adapter.py --- src/diffusers/loaders/ip_adapter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index 34c553778700..c867ac34b861 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -805,7 +805,7 @@ def load_ip_adapter( self.register_modules( feature_extractor=SiglipImageProcessor.from_pretrained(image_encoder_subfolder, **kwargs).to( - self.device + self.device, dtype=self.dtype ), image_encoder=SiglipVisionModel.from_pretrained(image_encoder_subfolder, torch_dtype=self.dtype, **kwargs).to( self.device From e6fd4e45d8c4739def5cd962fc1b37475f7f2b6a Mon Sep 17 00:00:00 2001 From: CyberVy <72680847+CyberVy@users.noreply.github.com> Date: Tue, 4 Mar 2025 00:42:32 +0800 Subject: [PATCH 5/6] Update ip_adapter.py --- src/diffusers/loaders/ip_adapter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index c867ac34b861..7e50128c1e3d 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -527,7 +527,7 @@ def load_ip_adapter( low_cpu_mem_usage=low_cpu_mem_usage, cache_dir=cache_dir, local_files_only=local_files_only, - dtype=image_encoder_dtype + dtype=image_encoder_dtype, ) .to(self.device) .eval() From b0f0a0f1507e436d24c2765238a21b5c8608226f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 3 Mar 2025 20:33:35 +0000 Subject: [PATCH 6/6] Apply style fixes --- src/diffusers/loaders/ip_adapter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/diffusers/loaders/ip_adapter.py b/src/diffusers/loaders/ip_adapter.py index 7e50128c1e3d..ac0a3c635332 100644 --- a/src/diffusers/loaders/ip_adapter.py +++ b/src/diffusers/loaders/ip_adapter.py @@ -807,9 +807,9 @@ def load_ip_adapter( feature_extractor=SiglipImageProcessor.from_pretrained(image_encoder_subfolder, **kwargs).to( self.device, dtype=self.dtype ), - image_encoder=SiglipVisionModel.from_pretrained(image_encoder_subfolder, torch_dtype=self.dtype, **kwargs).to( - self.device - ), + image_encoder=SiglipVisionModel.from_pretrained( + image_encoder_subfolder, torch_dtype=self.dtype, **kwargs + ).to(self.device), ) else: raise ValueError(