[Bugfix] Fix LTX2 CacheDiT Integration (#3621)
Signed-off-by: Alex Brooks <albrooks@redhat.com>
This commit is contained in:
1 parent
28ce618f0e
commit
cc0e15ba57
3 files changed
+119
-7
No files matched your search
+87
@@ -8,9 +8,14 @@ Model specific tests for CacheDiT enablement.
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
from cache_dit.caching.cache_blocks.pattern_0_1_2 import CachedBlocks_Pattern_0_1_2
|
||||
|
||||
import vllm_omni.diffusion.cache.cache_dit_backend as cd_backend
|
||||
from vllm_omni.diffusion.cache.cache_dit_backend import CacheDiTBackend
|
||||
from vllm_omni.diffusion.data import DiffusionCacheConfig
|
||||
from vllm_omni.diffusion.models.ltx2.ltx2_transformer import LTX2VideoTransformer3DModel
|
||||
from vllm_omni.platforms import current_omni_platform
|
||||
|
||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||
|
||||
@@ -40,3 +45,85 @@ def test_separate_cfg(mock_cache_dit, mock_block_adapter, enabler):
|
||||
mock_cache_dit.enable_cache.assert_called_once()
|
||||
adapter_kwargs = mock_block_adapter.call_args.kwargs
|
||||
assert adapter_kwargs["has_separate_cfg"] is True
|
||||
|
||||
|
||||
# This test is skipped on ROCm since rocm_unquantized_gemm doesn't support CPU backend
|
||||
@pytest.mark.skipif(
|
||||
current_omni_platform.is_rocm(),
|
||||
reason="vLLM ROCm custom ops lack CPU fallback",
|
||||
)
|
||||
def test_ltx2_cache_dit_receives_audio_as_encoder(init_fake_tp_group):
|
||||
"""CacheDiT Pattern_0 treats the second positional arg as encoder_hidden_states,
|
||||
which is a collision for one of the kwargs in LTX2 since we treat the audio
|
||||
hidden states as encoder_hidden_states.
|
||||
|
||||
This test ensures that a tiny LTX2 transformer can be initialized and run
|
||||
through the cache DiT backend without hitting a collision on the kwargs.
|
||||
"""
|
||||
seq_len = 4
|
||||
video_in = torch.full((1, seq_len, 16), 1.0)
|
||||
audio_in = torch.full((1, seq_len, 16), 2.0)
|
||||
text_in = torch.full((1, seq_len, 16), 3.0)
|
||||
audio_text_in = torch.full((1, seq_len, 16), 4.0)
|
||||
|
||||
model = LTX2VideoTransformer3DModel(
|
||||
in_channels=16,
|
||||
out_channels=16,
|
||||
patch_size=1,
|
||||
patch_size_t=1,
|
||||
num_attention_heads=2,
|
||||
attention_head_dim=8,
|
||||
cross_attention_dim=16,
|
||||
audio_in_channels=16,
|
||||
audio_out_channels=16,
|
||||
audio_num_attention_heads=2,
|
||||
audio_attention_head_dim=8,
|
||||
audio_cross_attention_dim=16,
|
||||
num_layers=2,
|
||||
caption_channels=16,
|
||||
)
|
||||
|
||||
# NOTE: This is currently using the LTX2 custom enabler, but the custom
|
||||
# enablers will be consolidated after
|
||||
# https://github.com/vllm-project/vllm-omni/pull/2527 lands.
|
||||
LTX2Pipeline = type("LTX2Pipeline", (), {})
|
||||
pipeline = LTX2Pipeline()
|
||||
pipeline.transformer = model
|
||||
backend = CacheDiTBackend(DiffusionCacheConfig())
|
||||
backend.enable(pipeline)
|
||||
backend.refresh(pipeline, num_inference_steps=5)
|
||||
|
||||
# Wrap call_Fn_blocks in CacheDiT so that we can verify the
|
||||
# hidden/encoder states are what we expect them to be
|
||||
captured = {}
|
||||
original = CachedBlocks_Pattern_0_1_2.call_Fn_blocks
|
||||
|
||||
def call_Fn_blocks_and_capture(self, hidden_states, encoder_hidden_states, *a, **kw):
|
||||
captured["hidden_states"] = hidden_states
|
||||
captured["encoder_hidden_states"] = encoder_hidden_states
|
||||
return original(self, hidden_states, encoder_hidden_states, *a, **kw)
|
||||
|
||||
# Also, map projections to identity so that we can just check
|
||||
# the captured tensors directly instead of having to reproject
|
||||
identity = torch.nn.Identity()
|
||||
with (
|
||||
patch.object(model, "proj_in", identity),
|
||||
patch.object(model, "audio_proj_in", identity),
|
||||
patch.object(CachedBlocks_Pattern_0_1_2, "call_Fn_blocks", call_Fn_blocks_and_capture),
|
||||
torch.no_grad(),
|
||||
):
|
||||
model(
|
||||
hidden_states=video_in,
|
||||
audio_hidden_states=audio_in,
|
||||
encoder_hidden_states=text_in,
|
||||
audio_encoder_hidden_states=audio_text_in,
|
||||
timestep=torch.tensor([[1000.0] * seq_len]),
|
||||
num_frames=1,
|
||||
height=2,
|
||||
width=2,
|
||||
audio_num_frames=seq_len,
|
||||
)
|
||||
|
||||
# Pattern_0 maps (hidden_states, encoder_hidden_states) to (video, audio)
|
||||
assert torch.equal(captured["hidden_states"], video_in)
|
||||
assert torch.equal(captured["encoder_hidden_states"], audio_in)
|
||||
Reference in new issue
Block a user