Fix cpu offload related slow tests #7618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
April 9, 2024 17:13
yiyixuxu
commented
Apr 9, 2024
| @@ -156,20 +156,6 @@ def __init__( | |||
| ) | |||
| self.register_to_config(requires_safety_checker=requires_safety_checker) | |||
|
|
|||
| def remove_all_hooks(self): | |||
There was a problem hiding this comment.
we have a remove_all_hooks method for all DiffusionPipeline now
yiyixuxu
commented
Apr 9, 2024
| @@ -335,9 +321,6 @@ def run_safety_checker(self, image, device, dtype): | |||
| nsfw_detected = None | |||
| watermark_detected = None | |||
|
|
|||
| if hasattr(self, "unet_offload_hook") and self.unet_offload_hook is not None: | |||
| self.unet_offload_hook.offload() | |||
There was a problem hiding this comment.
I don't think we need to manually offload anything anymore; I don't think unry_offload_hook on pipeline is ever used
yiyixuxu
commented
Apr 9, 2024
| @@ -139,6 +138,7 @@ class IFImg2ImgPipeline(DiffusionPipeline, LoraLoaderMixin): | |||
|
|
|||
| _optional_components = ["tokenizer", "text_encoder", "safety_checker", "feature_extractor", "watermarker"] | |||
| model_cpu_offload_seq = "text_encoder->unet" | |||
| _exclude_from_cpu_offload = ["watermarker"] | |||
There was a problem hiding this comment.
whatermarker does not work with the sequential_cpu_offload hooks, since they are very small, I'm just excluding it
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cleans up the cpu_offloading code for kandinsky & IF
This should fix all cpu offload tests failure related to IF and Kandisnky, e.g https://github.com/huggingface/diffusers/actions/runs/8594679447/job/23548137528#step:9:17
https://github.com/huggingface/diffusers/actions/runs/8594679447/job/23548137612#step:9:60
https://github.com/huggingface/diffusers/actions/runs/8594679447/job/23548137335#step:9:17
I still have a few tests related to
from_pipeI'm fixing here #7564 - but they are edge cases so don't have to worry about too much for now