-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
add initial Blackwell support #12702
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
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 | ||
|---|---|---|---|---|
|
|
@@ -31,7 +31,7 @@ set(ignoreMe "${VLLM_PYTHON_PATH}") | |||
| set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12") | ||||
|
|
||||
| # Supported NVIDIA architectures. | ||||
| set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") | ||||
| set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0;10.0;10.1;12.0") | ||||
|
|
||||
| # Supported AMD GPU architectures. | ||||
| set(HIP_SUPPORTED_ARCHS "gfx906;gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101") | ||||
|
|
@@ -228,7 +228,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
| SET(CUTLASS_ENABLE_HEADERS_ONLY ON CACHE BOOL "Enable only the header library") | ||||
|
|
||||
| # Set CUTLASS_REVISION manually -- its revision detection doesn't work in this case. | ||||
| set(CUTLASS_REVISION "v3.6.0" CACHE STRING "CUTLASS revision to use") | ||||
| set(CUTLASS_REVISION "v3.8.0" CACHE STRING "CUTLASS revision to use") | ||||
|
Contributor
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. Line 311 in 7ef5873
|
||||
|
|
||||
| # Use the specified CUTLASS source directory for compilation if VLLM_CUTLASS_SRC_DIR is provided | ||||
| if (DEFINED ENV{VLLM_CUTLASS_SRC_DIR}) | ||||
|
|
@@ -245,7 +245,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
| FetchContent_Declare( | ||||
| cutlass | ||||
| GIT_REPOSITORY https://github.com/nvidia/cutlass.git | ||||
| GIT_TAG v3.7.0 | ||||
| GIT_TAG v3.8.0 | ||||
| GIT_PROGRESS TRUE | ||||
|
|
||||
| # Speed up CUTLASS download by retrieving only the specified GIT_TAG instead of the history. | ||||
|
|
@@ -275,7 +275,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
| # Only build Marlin kernels if we are building for at least some compatible archs. | ||||
| # Keep building Marlin for 9.0 as there are some group sizes and shapes that | ||||
| # are not supported by Machete yet. | ||||
| cuda_archs_loose_intersection(MARLIN_ARCHS "8.0;8.6;8.7;8.9;9.0" "${CUDA_ARCHS}") | ||||
| cuda_archs_loose_intersection(MARLIN_ARCHS "8.0;8.6;8.7;8.9;9.0;10.0;10.1;12.0" "${CUDA_ARCHS}") | ||||
| if (MARLIN_ARCHS) | ||||
| set(MARLIN_SRCS | ||||
| "csrc/quantization/fp8/fp8_marlin.cu" | ||||
|
|
@@ -297,7 +297,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
|
|
||||
| # The cutlass_scaled_mm kernels for Hopper (c3x, i.e. CUTLASS 3.x) require | ||||
| # 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}") | ||||
| cuda_archs_loose_intersection(SCALED_MM_3X_ARCHS "9.0a;10.0a;10.1a;12.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" | ||||
|
|
@@ -331,7 +331,7 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
| # For the cutlass_scaled_mm kernels we want to build the c2x (CUTLASS 2.x) | ||||
| # kernels for the remaining archs that are not already built for 3x. | ||||
| cuda_archs_loose_intersection(SCALED_MM_2X_ARCHS | ||||
| "7.5;8.0;8.6;8.7;8.9;9.0" "${CUDA_ARCHS}") | ||||
| "7.5;8.0;8.6;8.7;8.9;9.0;10.0;10.1;12.0" "${CUDA_ARCHS}") | ||||
| # subtract out the archs that are already built for 3x | ||||
| list(REMOVE_ITEM SCALED_MM_2X_ARCHS ${SCALED_MM_3X_ARCHS}) | ||||
| if (SCALED_MM_2X_ARCHS) | ||||
|
|
@@ -451,6 +451,9 @@ if(VLLM_GPU_LANG STREQUAL "CUDA") | |||
| endif() | ||||
|
|
||||
| message(STATUS "Enabling C extension.") | ||||
| if(VLLM_GPU_LANG STREQUAL "CUDA") | ||||
| list(APPEND VLLM_C_LIBS cuda) | ||||
| endif() | ||||
| define_gpu_extension_target( | ||||
| _C | ||||
| DESTINATION vllm | ||||
|
|
@@ -459,6 +462,7 @@ define_gpu_extension_target( | |||
| COMPILE_FLAGS ${VLLM_GPU_FLAGS} | ||||
| ARCHITECTURES ${VLLM_GPU_ARCHES} | ||||
| INCLUDE_DIRECTORIES ${CUTLASS_INCLUDE_DIR};${CUTLASS_TOOLS_UTIL_INCLUDE_DIR} | ||||
| LIBRARIES ${VLLM_C_LIBS} | ||||
| USE_SABI 3 | ||||
| WITH_SOABI) | ||||
|
|
||||
|
|
@@ -482,7 +486,7 @@ set_gencode_flags_for_srcs( | |||
| CUDA_ARCHS "${CUDA_ARCHS}") | ||||
|
|
||||
| if(VLLM_GPU_LANG STREQUAL "CUDA") | ||||
| cuda_archs_loose_intersection(MARLIN_MOE_ARCHS "8.0;8.6;8.7;8.9;9.0" "${CUDA_ARCHS}") | ||||
| cuda_archs_loose_intersection(MARLIN_MOE_ARCHS "8.0;8.6;8.7;8.9;9.0;10.0;10.1;12.0" "${CUDA_ARCHS}") | ||||
| if (MARLIN_MOE_ARCHS) | ||||
| set(MARLIN_MOE_SRC | ||||
| "csrc/moe/marlin_kernels/marlin_moe_kernel.h" | ||||
|
|
||||
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
vllm/CMakeLists.txt
Lines 97 to 100 in 7ef5873
already updated.