Skip to content

Commit

Permalink
Changes for CUDA10
Browse files Browse the repository at this point in the history
- Change cutorch repo (https://github.com/nagadomi/cutorch/tree/cuda10)
- Fix FindCUDA.cmake
- Set __CUDA_NO_HALF_OPERATORS__ in install.sh
  • Loading branch information
nagadomi committed Dec 7, 2018
1 parent 0219027 commit 946affd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ build/
install/
*/*/build
extra/luafilesystem/lfs.so
*~
win-files/3rd/
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
[submodule "extra/cunn"]
path = extra/cunn
url = https://github.com/torch/cunn.git
[submodule "extra/cutorch"]
path = extra/cutorch
url = https://github.com/torch/cutorch.git
[submodule "pkg/torch"]
path = pkg/torch
url = https://github.com/torch/torch7.git
Expand Down Expand Up @@ -82,6 +79,9 @@
[submodule "extra/lua-cjson"]
path = extra/lua-cjson
url = https://github.com/mpx/lua-cjson
[submodule "extra/cutorch"]
path = extra/cutorch
url = http://github.com/nagadomi/cutorch.git
[submodule "extra/moses"]
path = extra/moses
url = https://github.com/Yonaba/Moses.git
4 changes: 3 additions & 1 deletion cmake/3.6/Modules/FindCUDA.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,9 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
endif()
endif()
if(CUDA_VERSION VERSION_GREATER "5.0")
find_cuda_helper_libs(cublas_device)
if (CUDA_VERSION VERSION_LESS "9.2")
find_cuda_helper_libs(cublas_device)
endif()
# In CUDA 5.5 NPP was splitted onto 3 separate libraries.
find_cuda_helper_libs(nppc)
find_cuda_helper_libs(nppi)
Expand Down
2 changes: 1 addition & 1 deletion extra/cutorch
3 changes: 3 additions & 0 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# No half operations
export TORCH_NVCC_FLAGS="-D__CUDA_NO_HALF_OPERATORS__"

SKIP_RC=0
BATCH_INSTALL=0

Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

git fetch
git reset --hard origin/master
git reset --hard
# Submodule update is done inside install.sh
./install.sh -s

0 comments on commit 946affd

Please sign in to comment.