refactor cache dir

xdit-project · Feb 24, 2025 · a65f479 · a65f479
1 parent ce7ed5f
commit a65f479
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@ profile/
 .vscode/
 xfuser.egg-info/
 dist/*
-latte_output.mp4
-cache/
+*.mp4
diff --git a/docs/developer/adding_models/readme.md b/docs/developer/adding_models/readme.md
@@ -1,4 +1,4 @@
-# Parallelize New Models with xDiT
+# Apply xDiT to new models
 
 xDiT was initially developed to accelerate the inference process of Diffusion Transformers (DiTs) within Huggingface `diffusers`. However, with the rapid emergence of various DiT models, you may find yourself needing to support new models that xDiT hasn't yet accommodated or models that are not officially supported by `diffusers` at all.
 

diff --git a/examples/flux_example.py b/examples/flux_example.py
@@ -16,7 +16,7 @@
     get_tensor_model_parallel_world_size,
     get_data_parallel_world_size,
 )
-
+from xfuser.model_executor.cache.diffusers_adapters import apply_cache_on_transformer
 
 def main():
     parser = FlexibleArgumentParser(description="xFuser Arguments")
@@ -49,7 +49,7 @@ def main():
     parameter_peak_memory = torch.cuda.max_memory_allocated(device=f"cuda:{local_rank}")
 
     pipe.prepare_run(input_config, steps=1)
-    from xfuser.model_executor.plugins.cache_.diffusers_adapters import apply_cache_on_transformer
+
     use_cache = engine_args.use_teacache or engine_args.use_fbcache
     if (use_cache
         and get_pipeline_parallel_world_size() == 1

diff --git a/xfuser/model_executor/plugins/__init__.py → xfuser/model_executor/cache/__init__.py b/xfuser/model_executor/plugins/__init__.py → xfuser/model_executor/cache/__init__.py
diff --git a/...ins/cache_/diffusers_adapters/__init__.py → ...utor/cache/diffusers_adapters/__init__.py b/...ins/cache_/diffusers_adapters/__init__.py → ...utor/cache/diffusers_adapters/__init__.py
@@ -4,7 +4,7 @@
 """
 import importlib
 from typing import Type, Dict, TypeVar
-from xfuser.model_executor.plugins.cache_.diffusers_adapters.registry import TRANSFORMER_ADAPTER_REGISTRY
+from xfuser.model_executor.cache.diffusers_adapters.registry import TRANSFORMER_ADAPTER_REGISTRY
 
 
 def apply_cache_on_transformer(transformer, *args, **kwargs):

diff --git a/...plugins/cache_/diffusers_adapters/flux.py → ...executor/cache/diffusers_adapters/flux.py b/...plugins/cache_/diffusers_adapters/flux.py → ...executor/cache/diffusers_adapters/flux.py
@@ -8,9 +8,9 @@
 import torch
 from torch import nn
 from diffusers import DiffusionPipeline, FluxTransformer2DModel
-from xfuser.model_executor.plugins.cache_.diffusers_adapters.registry import TRANSFORMER_ADAPTER_REGISTRY
+from xfuser.model_executor.cache.diffusers_adapters.registry import TRANSFORMER_ADAPTER_REGISTRY
 
-from xfuser.model_executor.plugins.cache_ import utils
+from xfuser.model_executor.cache import utils
 
 def create_cached_transformer_blocks(use_cache, transformer, rel_l1_thresh, return_hidden_states_first, num_steps):
     cached_transformer_class = {

diff --git a/...ins/cache_/diffusers_adapters/registry.py → ...utor/cache/diffusers_adapters/registry.py b/...ins/cache_/diffusers_adapters/registry.py → ...utor/cache/diffusers_adapters/registry.py
diff --git a/...er/model_executor/plugins/cache_/utils.py → xfuser/model_executor/cache/utils.py b/...er/model_executor/plugins/cache_/utils.py → xfuser/model_executor/cache/utils.py
diff --git a/xfuser/model_executor/plugins/cache_/__init__.py b/xfuser/model_executor/plugins/cache_/__init__.py