From db10128e57294b4467c42d0870c1af668eaa5ef1 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Fri, 26 Jan 2024 14:01:51 -0800 Subject: [PATCH 1/2] Clean up --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a90c341..9e03cae2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,9 +119,6 @@ target_link_directories(python PRIVATE ${CMAKE_SOURCE_DIR}/ort/lib) target_link_libraries(python PRIVATE onnxruntime-genai ${ONNXRUNTIME_LIB}) set_target_properties(python PROPERTIES OUTPUT_NAME "onnxruntime_genai") if(USE_CUDA AND CMAKE_CUDA_COMPILER) - set_target_properties(onnxruntime-genai PROPERTIES LINKER_LANGUAGE CUDA) - set_target_properties(python PROPERTIES LINKER_LANGUAGE CUDA) - set_target_properties(Tests PROPERTIES LINKER_LANGUAGE CUDA) target_link_libraries(onnxruntime-genai PRIVATE cublasLt cublas cudnn curand cufft cudart) target_link_libraries(Tests PRIVATE cublasLt cublas cudnn curand cufft cudart) target_link_libraries(python PRIVATE cublasLt cublas cudnn curand cufft cudart) From b4db1c6d3f1fdd33111dc6bb58645b5fad5a2b42 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sun, 28 Jan 2024 19:54:14 -0800 Subject: [PATCH 2/2] Clean up --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e03cae2b..20c87a65e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ include(CheckLanguage) check_language(CUDA) if (CMAKE_CUDA_COMPILER) message(STATUS "CUDA found CUDAToolkit_VERSION ${CUDAToolkit_VERSION} with CMAKE_CUDA_COMPILER ${CMAKE_CUDA_COMPILER}" ) - set(CMAKE_CUDA_RUNTIME_LIBRARY Shared) +# set(CMAKE_CUDA_RUNTIME_LIBRARY Shared) else() message(STATUS "CUDA not found") endif() @@ -119,6 +119,9 @@ target_link_directories(python PRIVATE ${CMAKE_SOURCE_DIR}/ort/lib) target_link_libraries(python PRIVATE onnxruntime-genai ${ONNXRUNTIME_LIB}) set_target_properties(python PROPERTIES OUTPUT_NAME "onnxruntime_genai") if(USE_CUDA AND CMAKE_CUDA_COMPILER) + set_target_properties(onnxruntime-genai PROPERTIES LINKER_LANGUAGE CUDA) + set_target_properties(python PROPERTIES LINKER_LANGUAGE CUDA) + set_target_properties(Tests PROPERTIES LINKER_LANGUAGE CUDA) target_link_libraries(onnxruntime-genai PRIVATE cublasLt cublas cudnn curand cufft cudart) target_link_libraries(Tests PRIVATE cublasLt cublas cudnn curand cufft cudart) target_link_libraries(python PRIVATE cublasLt cublas cudnn curand cufft cudart)