diff --git a/pyproject.toml b/pyproject.toml index 9d1e6fd48..2aebde92e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,6 @@ classifiers = [ dependencies = [ # Core runtime dependencies (required for actual usage) "omegaconf>=2.3.0", - # "decord>=0.6.0", # install manually "librosa>=0.11.0", "resampy>=0.4.3", "diffusers>=0.36.0", diff --git a/tests/diffusion/cache/test_cache_backends.py b/tests/diffusion/cache/test_cache_backends.py index 5713c6ba7..501a4c38c 100644 --- a/tests/diffusion/cache/test_cache_backends.py +++ b/tests/diffusion/cache/test_cache_backends.py @@ -41,7 +41,6 @@ class TestCacheDiTBackend: assert backend.config.Fn_compute_blocks == 4 assert backend.enabled is False - @patch("vllm_omni.diffusion.cache.cache_dit_backend.CACHE_DIT_AVAILABLE", True) @patch("vllm_omni.diffusion.cache.cache_dit_backend.cache_dit") def test_enable_single_transformer(self, mock_cache_dit): """Test enabling cache-dit on single-transformer pipeline.""" @@ -63,7 +62,6 @@ class TestCacheDiTBackend: assert backend._refresh_func is not None mock_cache_dit.enable_cache.assert_called_once() - @patch("vllm_omni.diffusion.cache.cache_dit_backend.CACHE_DIT_AVAILABLE", True) @patch("vllm_omni.diffusion.cache.cache_dit_backend.cache_dit") def test_refresh(self, mock_cache_dit): """Test refreshing cache context with SCM mask policy updates when num_inference_steps changes.""" diff --git a/vllm_omni/diffusion/cache/cache_dit_backend.py b/vllm_omni/diffusion/cache/cache_dit_backend.py index 5365466ad..2e1423b7d 100644 --- a/vllm_omni/diffusion/cache/cache_dit_backend.py +++ b/vllm_omni/diffusion/cache/cache_dit_backend.py @@ -10,6 +10,8 @@ pipelines in vllm-omni, supporting both single and dual-transformer architecture from collections.abc import Callable from typing import Any, Optional +import cache_dit +from cache_dit import BlockAdapter, DBCacheConfig, ForwardPattern, ParamsModifier, TaylorSeerCalibratorConfig from vllm.logger import init_logger from vllm_omni.diffusion.cache.base import CacheBackend @@ -17,15 +19,6 @@ from vllm_omni.diffusion.data import DiffusionCacheConfig, OmniDiffusionConfig logger = init_logger(__name__) -try: - import cache_dit - from cache_dit import BlockAdapter, DBCacheConfig, ForwardPattern, ParamsModifier, TaylorSeerCalibratorConfig - - CACHE_DIT_AVAILABLE = True -except ImportError: - CACHE_DIT_AVAILABLE = False - logger.warning("cache-dit is not installed. Cache-dit acceleration will not be available.") - # Registry of custom cache-dit enablers for specific models # Maps pipeline names to their cache-dit enablement functions @@ -325,9 +318,6 @@ class CacheDiTBackend(CacheBackend): Args: pipeline: The diffusion pipeline instance. """ - if not CACHE_DIT_AVAILABLE: - logger.warning("cache-dit is not available, skipping cache-dit setup.") - return # Extract pipeline name from pipeline pipeline_name = pipeline.__class__.__name__