[BugFix] eagle draft max position embeddings (#49343)
Signed-off-by: JaredforReal <w13431838023@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk>
This commit is contained in:
co-authored by
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Cyrus Leung
parent
ad5d29db70
commit
32e657e689
@@ -910,6 +910,15 @@ class SpeculativeConfig:
|
||||
f"Unsupported speculative method: '{self.method}'"
|
||||
)
|
||||
|
||||
if self.method in ("eagle", "eagle3"):
|
||||
# EAGLE drafts share the target's positional space; a
|
||||
# draft checkpoint with a smaller max_position_embeddings
|
||||
# than the target under-sizes its rotary cache (#48894).
|
||||
SpeculativeConfig._maybe_override_draft_max_position_embeddings(
|
||||
self.draft_model_config.hf_config,
|
||||
self.target_model_config.max_model_len,
|
||||
)
|
||||
|
||||
# Replace hf_config for EAGLE draft_model
|
||||
if self.method in ("eagle", "eagle3", "dflash"):
|
||||
from vllm.transformers_utils.configs.eagle import EAGLEConfig
|
||||
@@ -1130,6 +1139,40 @@ class SpeculativeConfig:
|
||||
)
|
||||
return result
|
||||
|
||||
@staticmethod
|
||||
def _maybe_override_draft_max_position_embeddings(
|
||||
draft_hf_config: PretrainedConfig,
|
||||
target_max_model_len: int,
|
||||
) -> None:
|
||||
"""Raise an EAGLE draft's max_position_embeddings up to the target's.
|
||||
|
||||
The proposer feeds the draft positions up to the target's
|
||||
max_model_len, while max_position_embeddings sizes the draft's
|
||||
rotary cos_sin_cache. A smaller checkpoint value (e.g. 2048 for
|
||||
yuhuili/EAGLE3-LLaMA3.1-Instruct-8B) makes that cache gather go
|
||||
out of bounds (#48894).
|
||||
|
||||
Args:
|
||||
draft_hf_config: The draft model's HF config, mutated in place.
|
||||
target_max_model_len: The target model's max_model_len.
|
||||
"""
|
||||
draft_max_position_embeddings = getattr(
|
||||
draft_hf_config, "max_position_embeddings", None
|
||||
)
|
||||
if (
|
||||
draft_max_position_embeddings is None
|
||||
or draft_max_position_embeddings >= target_max_model_len
|
||||
):
|
||||
return
|
||||
logger.info(
|
||||
"Overriding draft model max_position_embeddings from %d to the "
|
||||
"target model's max_model_len (%d); EAGLE drafts share the "
|
||||
"target's positional space.",
|
||||
draft_max_position_embeddings,
|
||||
target_max_model_len,
|
||||
)
|
||||
draft_hf_config.max_position_embeddings = target_max_model_len
|
||||
|
||||
@staticmethod
|
||||
def _verify_and_get_draft_tp(
|
||||
target_parallel_config: ParallelConfig,
|
||||
|
||||
@@ -1740,7 +1740,10 @@ class SpecDecodeBaseProposer:
|
||||
|
||||
attention_groups: dict[tuple[str, str], AttentionGroup] = {}
|
||||
if kv_cache_spec is not None:
|
||||
for layer_name in self._draft_attn_layer_names:
|
||||
# _draft_attn_layer_names is a set; iterate in sorted order so
|
||||
# that attention_groups (and anything derived from its first
|
||||
# element) is deterministic across processes.
|
||||
for layer_name in sorted(self._draft_attn_layer_names):
|
||||
attn_backend = all_attn_layers[layer_name].get_attn_backend()
|
||||
backend_key = attn_backend.full_cls_name()
|
||||
if backend_key not in attention_groups:
|
||||
@@ -1772,9 +1775,20 @@ class SpecDecodeBaseProposer:
|
||||
attention_groups[backend_key].layer_names.append(layer_name)
|
||||
|
||||
self.draft_attn_groups = list(attention_groups.values())
|
||||
self.block_size = (
|
||||
self.draft_attn_groups[0].get_metadata_builder().kv_cache_spec.block_size
|
||||
)
|
||||
if kernel_block_sizes is not None and 0 <= self.kv_cache_gid < len(
|
||||
kernel_block_sizes
|
||||
):
|
||||
# Slot mappings are computed against the block table, which is
|
||||
# stored at kernel-block granularity. Use the kernel block size
|
||||
# rather than the KV cache manager's block size; the two differ
|
||||
# when manager blocks are split for the attention kernel.
|
||||
self.block_size = kernel_block_sizes[self.kv_cache_gid]
|
||||
else:
|
||||
self.block_size = (
|
||||
self.draft_attn_groups[0]
|
||||
.get_metadata_builder()
|
||||
.kv_cache_spec.block_size
|
||||
)
|
||||
logger.debug("Using block size %d for drafting layers", self.block_size)
|
||||
|
||||
def _determine_batch_execution_and_padding(
|
||||
|
||||
Reference in New Issue
Block a user