Commit 6cc81877 authored by zhuwenwen's avatar zhuwenwen
Browse files

Merge branch 'v0.9.2-dev-lzg' into 'v0.9.2-dev'

fix deepseek pp + mtp issue

See merge request dcutoolkit/deeplearing/vllm!195
parents 4a62a3eb bfffd59a
...@@ -2088,7 +2088,8 @@ class GPUModelRunner(LoRAModelRunnerMixin): ...@@ -2088,7 +2088,8 @@ class GPUModelRunner(LoRAModelRunnerMixin):
hidden_states = outputs hidden_states = outputs
if self.speculative_config and self.speculative_config.use_eagle() and not is_profile: if self.speculative_config and self.speculative_config.use_eagle() and not is_profile:
assert isinstance(self.drafter, EagleProposer) #assert isinstance(self.drafter, EagleProposer)
if hasattr(self, 'drafter') and isinstance(self.drafter, EagleProposer):
self.drafter.dummy_run(num_tokens, attn_metadata) self.drafter.dummy_run(num_tokens, attn_metadata)
# This is necessary to avoid blocking DP. # This is necessary to avoid blocking DP.
...@@ -2677,9 +2678,10 @@ class GPUModelRunner(LoRAModelRunnerMixin): ...@@ -2677,9 +2678,10 @@ class GPUModelRunner(LoRAModelRunnerMixin):
kv_caches = self.initialize_kv_cache_tensors(kv_cache_config) kv_caches = self.initialize_kv_cache_tensors(kv_cache_config)
if self.speculative_config and self.speculative_config.use_eagle(): if self.speculative_config and self.speculative_config.use_eagle():
assert isinstance(self.drafter, EagleProposer) #assert isinstance(self.drafter, EagleProposer)
# validate all draft model layers belong to the same kv cache # validate all draft model layers belong to the same kv cache
# group # group
if hasattr(self, 'drafter') and isinstance(self.drafter, EagleProposer):
self.drafter.validate_same_kv_cache_group(kv_cache_config) self.drafter.validate_same_kv_cache_group(kv_cache_config)
if has_kv_transfer_group(): if has_kv_transfer_group():
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment