Skip to content

Commit a983181

Browse files
committed
fix benchmark/spmv and cuda flags
1 parent 5004ff3 commit a983181

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

benchmark/spmv/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ add_executable(spmv spmv.cpp)
22
target_link_libraries(spmv ginkgo gflags rapidjson)
33
if (GINKGO_BUILD_CUDA)
44
target_compile_definitions(spmv PRIVATE HAS_CUDA=1)
5+
if (NOT MSVC)
6+
target_link_libraries(spmv ginkgo ${CUDA_RUNTIME_LIBS}
7+
${CUBLAS} ${CUSPARSE})
8+
target_include_directories(spmv SYSTEM PRIVATE ${CUDA_INCLUDE_DIRS})
9+
endif()
510
if(CMAKE_CUDA_COMPILER_VERSION GREATER_EQUAL "9.2")
611
target_compile_definitions(spmv PRIVATE ALLOWMP=1)
712
endif()
8-
endif()
13+
endif()

cuda/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@ if ("${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}" STREQUAL "")
1414
set(CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES "${CMAKE_CUDA_ROOT_DIR}/lib/x64")
1515
endif()
1616

17+
# This is modified from https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace
1718
if(MSVC)
1819
if(BUILD_SHARED_LIBS)
1920
foreach(flag_var
2021
CMAKE_CUDA_FLAGS CMAKE_CUDA_FLAGS_DEBUG CMAKE_CUDA_FLAGS_RELEASE
2122
CMAKE_CUDA_FLAGS_MINSIZEREL CMAKE_CUDA_FLAGS_RELWITHDEBINFO)
22-
if(${flag_var} MATCHES "/MT")
23-
string(REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
24-
endif(${flag_var} MATCHES "/MT")
23+
if(${flag_var} MATCHES "-MT")
24+
string(REGEX REPLACE "-MT" "-MD" ${flag_var} "${${flag_var}}")
25+
endif(${flag_var} MATCHES "-MT")
2526
set(${flag_var} "${${flag_var}}" CACHE STRING "" FORCE)
2627
endforeach(flag_var)
2728
else()
2829
foreach(flag_var
2930
CMAKE_CUDA_FLAGS CMAKE_CUDA_FLAGS_DEBUG CMAKE_CUDA_FLAGS_RELEASE
3031
CMAKE_CUDA_FLAGS_MINSIZEREL CMAKE_CUDA_FLAGS_RELWITHDEBINFO)
31-
if(${flag_var} MATCHES "/MD")
32-
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
33-
endif(${flag_var} MATCHES "/MD")
32+
if(${flag_var} MATCHES "-MD")
33+
string(REGEX REPLACE "-MD" "-MT" ${flag_var} "${${flag_var}}")
34+
endif(${flag_var} MATCHES "-MD")
3435
set(${flag_var} "${${flag_var}}" CACHE STRING "" FORCE)
3536
endforeach(flag_var)
3637
endif()

0 commit comments

Comments
 (0)