Skip to content

[Kernel] Update cutlass_scaled_mm to support 2d group (blockwise) scaling #11868

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.

Sign up for GitHub

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
merged 25 commits into from
Jan 31, 2025
Merged

[Kernel] Update cutlass_scaled_mm to support 2d group (blockwise) scaling #11868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e99093c
working with 1s
LucasWilkinson Jan 8, 2025
d534c7d
split up compilation
LucasWilkinson Jan 8, 2025
17338be
seperate out gemm caller
LucasWilkinson Jan 8, 2025
90b71ca
fix b-scales
LucasWilkinson Jan 8, 2025
9463442
working!
LucasWilkinson Jan 8, 2025
2c0786d
format
LucasWilkinson Jan 8, 2025
5042d5d
make expand logic more readable
LucasWilkinson Jan 8, 2025
4662907
WIP update to new cutlass
LucasWilkinson Jan 9, 2025
f67c068
update to use new upstream
LucasWilkinson Jan 9, 2025
d963eb4
fix a scale loads not being predicated
LucasWilkinson Jan 10, 2025
9695687
cleanup tests and benchmark
LucasWilkinson Jan 10, 2025
87c8bc1
support benchmark filtering
LucasWilkinson Jan 10, 2025
77558e8
fix typo
LucasWilkinson Jan 10, 2025
8cffba9
support multiple filters
LucasWilkinson Jan 13, 2025
6c72d6d
minor refactor
LucasWilkinson Jan 13, 2025
e546e50
remove lineinfo
LucasWilkinson Jan 13, 2025
8aff229
explicit kernel list
LucasWilkinson Jan 13, 2025
111e8cc
fix format change
LucasWilkinson Jan 13, 2025
5f7460c
review comments
LucasWilkinson Jan 15, 2025
c2809fa
add cutlass_scaled_mm docstring
LucasWilkinson Jan 15, 2025
b17262f
review comments
LucasWilkinson Jan 20, 2025
e1253f2
merge conflicts
LucasWilkinson Jan 30, 2025
5f7ac9e
review comments
LucasWilkinson Jan 30, 2025
0d67e85
fix pre-commit
LucasWilkinson Jan 30, 2025
6977841
fix test_cutlass.py
tlrmchlsmth Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA")
FetchContent_Declare(
cutlass
GIT_REPOSITORY https://github.com/nvidia/cutlass.git
GIT_TAG v3.6.0
GIT_TAG v3.7.0
GIT_PROGRESS TRUE

# Speed up CUTLASS download by retrieving only the specified GIT_TAG instead of the history.
Expand Down Expand Up @@ -299,7 +299,12 @@ if(VLLM_GPU_LANG STREQUAL "CUDA")
# CUDA 12.0 or later (and only work on Hopper, 9.0a for now).
cuda_archs_loose_intersection(SCALED_MM_3X_ARCHS "9.0a" "${CUDA_ARCHS}")
if(${CMAKE_CUDA_COMPILER_VERSION} VERSION_GREATER 12.0 AND SCALED_MM_3X_ARCHS)
set(SRCS "csrc/quantization/cutlass_w8a8/scaled_mm_c3x.cu")
set(SRCS
"csrc/quantization/cutlass_w8a8/scaled_mm_c3x.cu"
"csrc/quantization/cutlass_w8a8/c3x/scaled_mm_sm90_fp8.cu"
"csrc/quantization/cutlass_w8a8/c3x/scaled_mm_sm90_int8.cu"
"csrc/quantization/cutlass_w8a8/c3x/scaled_mm_azp_sm90_int8.cu"
"csrc/quantization/cutlass_w8a8/c3x/scaled_mm_blockwise_sm90_fp8.cu")
set_gencode_flags_for_srcs(
SRCS "${SRCS}"
CUDA_ARCHS "${SCALED_MM_3X_ARCHS}")
Expand Down
Loading