-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
[Bugfix] Add custom Triton cache manager to resolve MoE MP issue #6140
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6a15062
Dockerfile: use custom cache manager in Triton.
tdoublep 0d54387
Minor error in Dockerfile
tdoublep b803165
Include custom cache manager as part of vllm
tdoublep d3ef0d8
Add __init__.py
tdoublep eb5c892
remove triton_patch dir
tdoublep 81eef8a
Format
tdoublep b040645
Address review comments
tdoublep 4dd9367
Only change cache manager for tp>1
tdoublep 889d6dd
Add some docstrings
tdoublep 3307522
Update docstring
tdoublep 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 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
Empty file.
This file contains 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 |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import os | ||
|
||
from triton.runtime.cache import (FileCacheManager, default_cache_dir, | ||
default_dump_dir, default_override_dir) | ||
|
||
|
||
class CustomCacheManager(FileCacheManager): | ||
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. Document why do we need this? 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. added some docstrings |
||
|
||
def __init__(self, key, override=False, dump=False): | ||
self.key = key | ||
self.lock_path = None | ||
if dump: | ||
self.cache_dir = default_dump_dir() | ||
self.cache_dir = os.path.join(self.cache_dir, self.key) | ||
self.lock_path = os.path.join(self.cache_dir, "lock") | ||
os.makedirs(self.cache_dir, exist_ok=True) | ||
elif override: | ||
self.cache_dir = default_override_dir() | ||
self.cache_dir = os.path.join(self.cache_dir, self.key) | ||
else: | ||
# create cache directory if it doesn't exist | ||
self.cache_dir = os.getenv("TRITON_CACHE_DIR", | ||
"").strip() or default_cache_dir() | ||
if self.cache_dir: | ||
self.cache_dir = f"{self.cache_dir}_{os.getpid()}" | ||
self.cache_dir = os.path.join(self.cache_dir, self.key) | ||
self.lock_path = os.path.join(self.cache_dir, "lock") | ||
os.makedirs(self.cache_dir, exist_ok=True) | ||
else: | ||
raise RuntimeError("Could not create or locate cache dir") |
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.
If the user manually sets this env, can we modify it? Additionally, I suggest adding a log message for clarification
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.
have changed it so that we only set it if the user has not. also added a log message