-
Notifications
You must be signed in to change notification settings - Fork 941
fix: Add SM120 (RTX Blackwell desktop) support for NVFP4 MoE kernels #2725
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
Merged
aleozlx
merged 8 commits into
flashinfer-ai:main
from
brandonmmusic-max:fix/sm120-nvfp4-moe-capability-checks
Mar 20, 2026
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
15322e6
fix: Add SM120 (RTX Blackwell desktop) support for NVFP4 MoE kernels
brandonmmusic-max 0b74d46
fix: Address reviewer feedback — explicit allowlist, error messages, …
brandonmmusic-max 4c1799c
fix: Add CUDA version gating and arch normalization
brandonmmusic-max 45d94e9
fix: Restrict f suffix normalization to SM120 only
brandonmmusic-max 700fc84
fix: Remove redundant SM capability check in FP4 MoE init
brandonmmusic-max 1c18b48
fix: Broaden exception handling in _normalize_cuda_arch
brandonmmusic-max 27fea45
fix: normalize all SM 12.x architectures to SM 120f
b884fa9
style: fix pre-commit formatting (clang-format + ruff)
brandonmmusic-max 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
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 |
|---|---|---|
|
|
@@ -30,20 +30,55 @@ class CompilationContext: | |
| "-DFLASHINFER_ENABLE_FP4_E2M1", | ||
| ] | ||
|
|
||
| @staticmethod | ||
| def _normalize_cuda_arch(major: int, minor: int) -> tuple[int, str]: | ||
| """Normalize a (major, minor) capability pair into a (major, minor_str) | ||
| tuple with the correct architecture suffix for nvcc. | ||
|
|
||
| SM 9.x -> 'a' suffix (e.g. compute_90a) | ||
| SM 12.x -> 'f' suffix (e.g. compute_120f) when the installed CUDA | ||
| toolchain supports it (CUDA >= 13.0), otherwise 'a'. | ||
| SM 10+ -> 'a' suffix (e.g. compute_100a) | ||
| SM < 9 -> no suffix | ||
| """ | ||
| if major == 9: | ||
| return (major, str(minor) + "a") | ||
| elif major == 12: | ||
|
Member
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. One last nit after discussing with @nv-yunzheq ; I think we also want to compile DGX spark (sm121) to sm120f, instead of 121f. Can we change the logic to return always major + 0f (or just 120f) on line 50? |
||
| try: | ||
| from flashinfer.jit.cpp_ext import is_cuda_version_at_least | ||
| if is_cuda_version_at_least("13.0"): | ||
| return (major, str(minor) + "f") | ||
|
kahyunnam marked this conversation as resolved.
Outdated
|
||
| except ImportError: | ||
| logger.debug( | ||
| "Could not import is_cuda_version_at_least; " | ||
| "falling back to 'a' suffix for SM %d.%d", major, minor | ||
| ) | ||
| return (major, str(minor) + "a") | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| elif major >= 10: | ||
| return (major, str(minor) + "a") | ||
| return (major, str(minor)) | ||
|
|
||
| def __init__(self): | ||
| self.TARGET_CUDA_ARCHS = set() | ||
| if "FLASHINFER_CUDA_ARCH_LIST" in os.environ: | ||
| for arch in os.environ["FLASHINFER_CUDA_ARCH_LIST"].split(" "): | ||
| major, minor = arch.split(".") | ||
| major = int(major) | ||
| self.TARGET_CUDA_ARCHS.add((int(major), str(minor))) | ||
| # If the user already provided a suffix (e.g. "12.0f"), | ||
| # respect it as-is; otherwise normalise. | ||
| if minor[-1].isalpha(): | ||
| self.TARGET_CUDA_ARCHS.add((major, minor)) | ||
| else: | ||
| self.TARGET_CUDA_ARCHS.add( | ||
| self._normalize_cuda_arch(major, int(minor)) | ||
| ) | ||
| else: | ||
| try: | ||
| for device in range(torch.cuda.device_count()): | ||
| major, minor = torch.cuda.get_device_capability(device) | ||
| if major >= 9: | ||
| minor = str(minor) + "a" | ||
| self.TARGET_CUDA_ARCHS.add((int(major), str(minor))) | ||
| self.TARGET_CUDA_ARCHS.add( | ||
| self._normalize_cuda_arch(major, minor) | ||
| ) | ||
| except Exception as e: | ||
| logger.warning(f"Failed to get device capability: {e}.") | ||
|
|
||
|
|
||
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
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.
Maybe 11 (Thor) also works? it should very similar to 10.x