Skip to content

Commit b5dab15

Browse files
authored
Remove deprecated use of find_package(CUDA) (#98)
* Remove deprecated use of find_package(CUDA) * Fix CUDA architectures
1 parent 9dfb76b commit b5dab15

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

CMakeLists.txt

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ FetchContent_MakeAvailable(repo-common repo-core)
7777
# CUDA
7878
#
7979
if(${TRITON_ENABLE_GPU})
80-
set(CUDA_USE_STATIC_CUDA_RUNTIME OFF)
8180
find_package(CUDAToolkit REQUIRED)
82-
find_package(CUDA REQUIRED)
83-
message(STATUS "Using CUDA ${CUDA_VERSION}")
84-
set(CUDA_NVCC_FLAGS -std=c++${TRITON_MIN_CXX_STANDARD})
81+
set(CMAKE_CUDA_RUNTIME_LIBRARY Shared)
82+
message(STATUS "Using CUDA ${CUDAToolkit_VERSION}")
8583

86-
if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1")
84+
if(CUDAToolkit_VERSION VERSION_GREATER "10.1" OR CUDAToolkit_VERSION VERSION_EQUAL "10.1")
8785
add_definitions(-DTRITON_ENABLE_CUDA_GRAPH=1)
8886
else()
8987
message(WARNING "CUDA ${CUDA_VERSION} does not support CUDA graphs.")
@@ -115,21 +113,19 @@ add_library(
115113
)
116114

117115
if(${TRITON_ENABLE_GPU})
118-
set(HOST_COMPILER_FLAGS "")
119-
if (WIN32)
120-
set(HOST_COMPILER_FLAGS "/MD")
121-
else()
122-
set(HOST_COMPILER_FLAGS "-fPIC")
123-
endif()
124-
125-
set(CUDA_LIBRARIES PUBLIC ${CUDA_LIBRARIES})
126-
cuda_add_library(
116+
add_library(
127117
kernel_library_new
128118
src/kernel.cu src/kernel.h
129-
OPTIONS -arch compute_53
130-
OPTIONS -code compute_53,sm_53,sm_60,sm_61,sm_62,sm_70,sm_72,sm_75
131-
OPTIONS -Xcompiler ${HOST_COMPILER_FLAGS}
132119
)
120+
121+
enable_language(CUDA)
122+
set_target_properties(kernel_library_new PROPERTIES LANGUAGE CUDA)
123+
set_target_properties(kernel_library_new PROPERTIES CUDA_ARCHITECTURES "53;60-real;62-real;70-real;72-real;75-real;80-real;86-real;89-real;90-real")
124+
set_target_properties(kernel_library_new PROPERTIES POSITION_INDEPENDENT_CODE ON)
125+
set_target_properties(kernel_library_new PROPERTIES LINKER_LANGUAGE CUDA)
126+
target_compile_features(kernel_library_new PUBLIC cxx_std_${TRITON_MIN_CXX_STANDARD})
127+
set_target_properties(kernel_library_new PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
128+
133129
endif() # TRITON_ENABLE_GPU
134130

135131
add_library(

0 commit comments

Comments
 (0)