Skip to content
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

Fixing issue #1395 #1396

Merged
merged 11 commits into from
Jul 7, 2018
+2 −2
Merged

Fixing issue #1395 #1396

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bbd7250
Merge pull request #1 from dmlc/master
wangshangsam Jun 8, 2018
3a95de4
Merge pull request #2 from dmlc/master
wangshangsam Jun 11, 2018
393367d
Merge pull request #3 from dmlc/master
wangshangsam Jun 12, 2018
ea83b3f
Merge pull request #4 from dmlc/master
wangshangsam Jun 13, 2018
0bd744a
Merge pull request #5 from dmlc/master
wangshangsam Jun 19, 2018
611c53d
Merge pull request #6 from dmlc/master
wangshangsam Jun 26, 2018
81dabb7
Merge pull request #7 from dmlc/master
wangshangsam Jun 28, 2018
1fdbea9
Merge pull request #8 from dmlc/master
wangshangsam Jul 3, 2018
1c35e79
Merge pull request #9 from dmlc/master
wangshangsam Jul 6, 2018
5e27564
Fixing issue #1395: Undefined symbol: cudaGetDevice
wangshangsam Jul 6, 2018
0816ef1
Merge pull request #10 from dmlc/master
wangshangsam Jul 6, 2018
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
4 changes: 2 additions & 2 deletions cmake/util/FindCUDA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ macro(find_cuda use_cuda)
set(CUDA_INCLUDE_DIRS ${CUDA_TOOLKIT_ROOT_DIR}/include)
set(CUDA_FOUND TRUE)
if(MSVC)
find_library(CUDA_CUDAT_LIBRARY cudart
find_library(CUDA_CUDART_LIBRARY cudart
${CUDA_TOOLKIT_ROOT_DIR}/lib64
${CUDA_TOOLKIT_ROOT_DIR}/lib)
else(MSVC)
find_library(CUDA_CUDAT_LIBRARY cudart
find_library(CUDA_CUDART_LIBRARY cudart
${CUDA_TOOLKIT_ROOT_DIR}/lib64
${CUDA_TOOLKIT_ROOT_DIR}/lib)
endif(MSVC)
Expand Down