From 68f2409e34b0756f616c554527831b38c5eba800 Mon Sep 17 00:00:00 2001 From: suharvest Date: Sat, 25 Jul 2026 19:21:41 +0800 Subject: [PATCH 1/2] fix: Respect explicit CUDA architectures Signed-off-by: suharvest --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15795740..25933ca4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,16 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +# Record whether the user explicitly requested CUDA architectures before +# project() runs. enable_language(CUDA) initializes CMAKE_CUDA_ARCHITECTURES to +# a compiler default, so testing it afterwards cannot distinguish a +# user-provided value from that default. +set(_EDGELLM_USER_CUDA_ARCHS FALSE) +if(DEFINED CMAKE_CUDA_ARCHITECTURES + AND NOT CMAKE_CUDA_ARCHITECTURES STREQUAL "") + set(_EDGELLM_USER_CUDA_ARCHS TRUE) +endif() + project( tensorrt_edgellm_sdk VERSION 0.9.1 @@ -61,7 +71,7 @@ endif() set_ifndef(CUDA_CTK_VERSION 12.8) set_ifndef(CUDA_DIR /usr/local/cuda-${CUDA_CTK_VERSION}) -if(NOT DEFINED AARCH64_BUILD) +if(NOT _EDGELLM_USER_CUDA_ARCHS AND NOT DEFINED AARCH64_BUILD) set(CMAKE_CUDA_ARCHITECTURES 80;86;89) if(CUDA_CTK_VERSION VERSION_GREATER_EQUAL 12.8) list(APPEND CMAKE_CUDA_ARCHITECTURES 100a 120) From b406116a27957f11b18210989460429c7327973f Mon Sep 17 00:00:00 2001 From: suharvest Date: Sat, 25 Jul 2026 19:21:43 +0800 Subject: [PATCH 2/2] fix: Propagate CuTe DSL shim through static libraries Signed-off-by: suharvest --- cmake/CuteDsl.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/CuteDsl.cmake b/cmake/CuteDsl.cmake index a10e632c..862b8b7e 100644 --- a/cmake/CuteDsl.cmake +++ b/cmake/CuteDsl.cmake @@ -1043,7 +1043,8 @@ function(cute_dsl_setup) foreach(_tgt ${ARG_LINK_TARGETS}) get_target_property(_tgt_type ${_tgt} TYPE) if(_tgt_type STREQUAL "STATIC_LIBRARY") - target_link_libraries(${_tgt} PUBLIC ${_link_libs}) + target_link_libraries(${_tgt} PUBLIC ${_link_libs} + trt_edgellm_cutedsl_cudart_shim) else() target_link_libraries(${_tgt} PRIVATE ${_link_libs} trt_edgellm_cutedsl_cudart_shim) @@ -1056,7 +1057,12 @@ function(cute_dsl_setup) if(NOT _cute_dsl_cuda_ver STREQUAL "" AND _cute_dsl_cuda_ver VERSION_GREATER_EQUAL 12.0 AND _cute_dsl_cuda_ver VERSION_LESS 12.8) - target_link_options(${_tgt} PRIVATE "-Wl,--wrap=_cudaLaunchKernelEx") + if(_tgt_type STREQUAL "STATIC_LIBRARY") + target_link_options(${_tgt} INTERFACE + "-Wl,--wrap=_cudaLaunchKernelEx") + else() + target_link_options(${_tgt} PRIVATE "-Wl,--wrap=_cudaLaunchKernelEx") + endif() endif() endforeach()