From db3d0e62a7bb6d3160d2a12a719bd45909c4f2b7 Mon Sep 17 00:00:00 2001 From: Tyler Michael Smith Date: Thu, 22 May 2025 19:53:21 +0000 Subject: [PATCH 1/4] Fixup CUDA compiler version check for CUDA_SUPPORTED_ARCHS Signed-off-by: Tyler Michael Smith --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffb801d62619..209c70e083d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ set(ignoreMe "${VLLM_PYTHON_PATH}") set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12") # Supported NVIDIA architectures. -if(${CMAKE_CUDA_COMPILER_VERSION} VERSION_GREATER_EQUAL) +if(${CMAKE_CUDA_COMPILER_VERSION} VERSION_GREATER_EQUAL 12.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") else() set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") From 14770d25931305bfecf3693cbdc6ff33405bc947 Mon Sep 17 00:00:00 2001 From: Tyler Michael Smith Date: Thu, 22 May 2025 20:07:47 +0000 Subject: [PATCH 2/4] fixup Signed-off-by: Tyler Michael Smith --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 209c70e083d6..57e8701c3c2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,8 @@ set(ignoreMe "${VLLM_PYTHON_PATH}") set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12") # Supported NVIDIA architectures. -if(${CMAKE_CUDA_COMPILER_VERSION} VERSION_GREATER_EQUAL 12.0) +if(DEFINED CMAKE_CUDA_COMPILER_VERSION AND + CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "12.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") else() set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") From a9a1e22dc6c5fee13e22b157207aac0594cd0524 Mon Sep 17 00:00:00 2001 From: simon-mo Date: Thu, 22 May 2025 18:45:21 -0700 Subject: [PATCH 3/4] 12.8 Signed-off-by: simon-mo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57e8701c3c2f..c176cbf9d3f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12") # Supported NVIDIA architectures. if(DEFINED CMAKE_CUDA_COMPILER_VERSION AND - CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0") + CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "12.8") 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") else() set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") From a0b4ad5c47bf320fcaf18415ea3343a158919a3e Mon Sep 17 00:00:00 2001 From: simon-mo Date: Thu, 22 May 2025 22:11:43 -0700 Subject: [PATCH 4/4] move to enable blackwell Signed-off-by: simon-mo --- CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c176cbf9d3f3..6a1ed588749a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,14 +29,6 @@ set(ignoreMe "${VLLM_PYTHON_PATH}") # set(PYTHON_SUPPORTED_VERSIONS "3.9" "3.10" "3.11" "3.12") -# Supported NVIDIA architectures. -if(DEFINED CMAKE_CUDA_COMPILER_VERSION AND - CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "12.8") - 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") -else() - set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") -endif() - # Supported AMD GPU architectures. set(HIP_SUPPORTED_ARCHS "gfx906;gfx908;gfx90a;gfx942;gfx950;gfx1030;gfx1100;gfx1101;gfx1200;gfx1201") @@ -84,6 +76,15 @@ endif() # find_package(Torch REQUIRED) +# Supported NVIDIA architectures. +# This check must happen after find_package(Torch) because that's when CMAKE_CUDA_COMPILER_VERSION gets defined +if(DEFINED CMAKE_CUDA_COMPILER_VERSION AND + CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 12.8) + 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") +else() + set(CUDA_SUPPORTED_ARCHS "7.0;7.2;7.5;8.0;8.6;8.7;8.9;9.0") +endif() + # # Forward the non-CUDA device extensions to external CMake scripts. #