-
Notifications
You must be signed in to change notification settings - Fork 2.7k
[None][fix] Allow fail-early when reuse block and legacy mamba cache #15540
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Wanli-Jiang
wants to merge
1
commit into
NVIDIA:main
from
Wanli-Jiang:user/williamj/fail-fast-for-wrong-comb
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -316,22 +316,18 @@ def _get_model_kv_cache_manager_cls( | |
| "KVCacheManagerV2 is not supported with %s. " | ||
| "Falling back to KVCacheManager.", incompat_str) | ||
| cls = KVCacheManager | ||
| # The V1-route hybrid mamba managers (disagg, TRTLLM_USE_CPP_MAMBA, | ||
| # TRTLLM_USE_PY_MAMBA, or one-model speculative decoding) keep mamba | ||
| # state in a separate cache that doesn't honor block reuse. Warn at | ||
| # the routing site so users see the warning where the decision is | ||
| # actually made. | ||
| # Block reuse isn't honored by the legacy Mixed mamba manager (the unified | ||
| # CppMambaHybridCacheManager is, even under MTP). Fail fast if reuse was | ||
| # requested but routing still resolved to Mixed, rather than dropping it. | ||
| if is_hybrid_linear(model_engine.model.model_config.pretrained_config) \ | ||
| and kv_cache_config.enable_block_reuse: | ||
| uses_v1_mamba_route = self._is_disagg \ | ||
| or os.environ.get('TRTLLM_USE_CPP_MAMBA', '0') == '1' \ | ||
| or os.environ.get('TRTLLM_USE_PY_MAMBA', '0') == '1' \ | ||
| or self._speculative_config is not None | ||
| if uses_v1_mamba_route: | ||
| logger.warning( | ||
| "Block reuse does not work with MTP for hybrid linear models " | ||
| "when using the legacy MambaCacheManager (TRTLLM_USE_CPP_MAMBA=1)" | ||
| ) | ||
| and kv_cache_config.enable_block_reuse \ | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's await this #15533 ci pipeline |
||
| and issubclass(cls, MixedMambaHybridCacheManager): | ||
| raise ValueError( | ||
| "enable_block_reuse=True is not supported by the legacy " | ||
| "MixedMambaHybridCacheManager selected for this hybrid linear " | ||
| "model. Unset TRTLLM_USE_CPP_MAMBA / TRTLLM_USE_PY_MAMBA to use " | ||
| "the unified CppMambaHybridCacheManager, which supports block " | ||
| "reuse (including under MTP).") | ||
| return cls | ||
|
|
||
| def _per_manager_cache_cost(self, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually we can drop this part since no longer used.