Skip to content

Update cutlass to a version that supports CUDA 13 #2774

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
rapids-bot merged 6 commits into from
Aug 8, 2025
Merged

Update cutlass to a version that supports CUDA 13 #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f68b55e
Update cutlass to a version that supports CUDA 13
robertmaynard Apr 24, 2025
a6c781f
Patch cutlass to restore CTK 12 layout support
robertmaynard Aug 5, 2025
11a6896
remove diff lines
robertmaynard Aug 5, 2025
115282c
Correct fixed_in entry
robertmaynard Aug 6, 2025
3ca7398
Remove white space from patch
robertmaynard Aug 6, 2025
3953088
Merge branch 'branch-25.10' into update_cuda_13_runtime_api
robertmaynard Aug 6, 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
31 changes: 31 additions & 0 deletions cpp/cmake/patches/cutlass/Support-both-CUDA-12-and-13-cccl-header-locations.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 661c7e679ac72926d619da46834d09f52a727f5e Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Tue, 5 Aug 2025 15:05:57 -0400
Subject: [PATCH] Support both CUDA 12 and 13 cccl header locations

---
CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38dcca9f..4088b71f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -704,8 +704,14 @@ target_include_directories(
CUTLASS
SYSTEM INTERFACE
$<BUILD_INTERFACE:${CUDA_TOOLKIT_ROOT_DIR}/include>
- $<BUILD_INTERFACE:${CUDA_TOOLKIT_ROOT_DIR}/include/cccl>
)
+if(CUDA_VERSION VERSION_GREATER_EQUAL 13.0)
+ target_include_directories(
+ CUTLASS
+ SYSTEM INTERFACE
+ $<BUILD_INTERFACE:${CUDA_TOOLKIT_ROOT_DIR}/include/cccl>
+ )
+endif()

install(
DIRECTORY
--
2.39.5 (Apple Git-154)
26 changes: 0 additions & 26 deletions cpp/cmake/patches/cutlass/build-export.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions cpp/cmake/patches/cutlass_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"packages" : {
"cutlass" : {
"version": "3.5.1",
"version": "4.1.0",
"git_url": "https://github.com/NVIDIA/cutlass.git",
"git_tag": "v${version}",
"patches" : [
{
"file" : "${current_json_dir}/cutlass/build-export.patch",
"issue" : "Fix build directory export",
"file" : "${current_json_dir}/cutlass/Support-both-CUDA-12-and-13-cccl-header-locations.patch",
"issue" : "Support CUDA 12 CTK layout[https://github.com/NVIDIA/cutlass/pull/2543]",
"fixed_in" : ""
}
]
Expand Down
16 changes: 5 additions & 11 deletions cpp/cmake/thirdparty/get_cutlass.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,14 @@ function(find_and_configure_cutlass)
include("${rapids-cmake-dir}/cpm/package_override.cmake")
rapids_cpm_package_override("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../patches/cutlass_override.json")

include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
rapids_cpm_package_details(cutlass version repository tag shallow exclude)

include("${rapids-cmake-dir}/cpm/detail/generate_patch_command.cmake")
rapids_cpm_generate_patch_command(cutlass ${version} patch_command build_patch_only)
include("${rapids-cmake-dir}/cpm/detail/package_info.cmake")
rapids_cpm_package_info(cutlass VERSION_VAR version FIND_VAR find_args CPM_VAR cpm_find_info
TO_INSTALL_VAR to_install)

rapids_cpm_find(
NvidiaCutlass ${version} ${build_patch_only}
NvidiaCutlass ${version} ${find_args}
GLOBAL_TARGETS nvidia::cutlass::cutlass
CPM_ARGS
GIT_REPOSITORY ${repository}
GIT_TAG ${tag}
GIT_SHALLOW ${shallow} ${patch_command}
CPM_ARGS ${cpm_find_info}
OPTIONS "CUDAToolkit_ROOT ${CUDAToolkit_LIBRARY_DIR}"
)

Expand All @@ -67,7 +62,6 @@ function(find_and_configure_cutlass)
NAMESPACE nvidia::cutlass::
)
endif()
# endif()

# We generate the cutlass-config files when we built cutlass locally, so always do
# `find_dependency`
Expand Down