[Spec Decode] DFlash2: local convolution + candidate selector (#52816)
This commit is contained in:
@@ -21,12 +21,13 @@ from vllm.v1.worker.gpu.spec_decode.eagle.eagle3_utils import (
|
||||
)
|
||||
|
||||
|
||||
def _config(num_hidden_layers, layer_types=None, causal_override=None):
|
||||
def _config(num_hidden_layers, layer_types=None, causal_override=None, is_causal=None):
|
||||
dflash_config = None if causal_override is None else {"causal": causal_override}
|
||||
return SimpleNamespace(
|
||||
num_hidden_layers=num_hidden_layers,
|
||||
layer_types=layer_types,
|
||||
dflash_config=dflash_config,
|
||||
is_causal=is_causal,
|
||||
)
|
||||
|
||||
|
||||
@@ -40,6 +41,19 @@ def _config(num_hidden_layers, layer_types=None, causal_override=None):
|
||||
_config(2, layer_types=["sliding_attention"] * 2, causal_override=False),
|
||||
True,
|
||||
),
|
||||
# DFlash2 stores the explicit attention semantics at the top level.
|
||||
(
|
||||
_config(
|
||||
2,
|
||||
layer_types=["sliding_attention"] * 2,
|
||||
is_causal=False,
|
||||
),
|
||||
True,
|
||||
),
|
||||
(
|
||||
_config(2, layer_types=["full_attention"] * 2, is_causal=True),
|
||||
False,
|
||||
),
|
||||
# SWA-derived: full-attention layers are non-causal.
|
||||
(_config(2, layer_types=["sliding_attention", "full_attention"]), True),
|
||||
# SWA-derived: all-sliding is fully causal.
|
||||
@@ -59,6 +73,16 @@ def test_dflash_layer_causal_is_per_layer():
|
||||
assert _dflash_layer_causal(config, 1) is False
|
||||
|
||||
|
||||
def test_dflash_layer_causal_honors_top_level_override():
|
||||
config = _config(
|
||||
2,
|
||||
layer_types=["sliding_attention", "full_attention"],
|
||||
is_causal=False,
|
||||
)
|
||||
assert _dflash_layer_causal(config, 0) is False
|
||||
assert _dflash_layer_causal(config, 1) is False
|
||||
|
||||
|
||||
def _vllm_config(**draft_config):
|
||||
config = SimpleNamespace(**draft_config)
|
||||
return SimpleNamespace(
|
||||
|
||||
Reference in New Issue
Block a user