diff options
| author | Rui Guo <guorui.xt@gmail.com> | 2017-01-27 07:59:01 +0300 |
|---|---|---|
| committer | Rui Guo <guorui.xt@gmail.com> | 2017-01-27 07:59:01 +0300 |
| commit | c1ea3035a7668b093b8f247c32795288ff84767e (patch) | |
| tree | 3992e56257dfe67665db18fe2bd30ffa1483d557 | |
| parent | 79ef356f6522af1ffc09117e022af483993224d7 (diff) | |
| parent | 41f10b0641a88cfbf2d6d6bc460a104a3e69e003 (diff) | |
remove cutorch.patch as master is now pointing to the patched version
| m--------- | exe/trepl | 0 | ||||
| m--------- | extra/cunn | 0 | ||||
| m--------- | extra/cutorch | 0 | ||||
| m--------- | extra/nn | 0 | ||||
| m--------- | extra/penlight | 0 | ||||
| -rw-r--r-- | install.bat | 2 | ||||
| m--------- | pkg/image | 0 | ||||
| m--------- | pkg/torch | 0 | ||||
| -rw-r--r-- | win-files/patch/cutorch.patch | 13 |
9 files changed, 1 insertions, 14 deletions
diff --git a/exe/trepl b/exe/trepl -Subproject f8831bee21a9d6a41e47ef8626a3bef9ca2d66e +Subproject 818868e23521ec1eb6b4bea32714fe39024e01d diff --git a/extra/cunn b/extra/cunn -Subproject 49d1c06b9daad86acce7380595b914230360d89 +Subproject df99d8cf83dd58494eb55a9facd0a9323202104 diff --git a/extra/cutorch b/extra/cutorch -Subproject e13b2eb2cc1cff00f5b1c5eb4c18ac719f56f4d +Subproject 7112d9e722f067eac298692dd06d79f1f3cdb90 diff --git a/extra/nn b/extra/nn -Subproject e77b592edf01560350dbbbda06bd9fdea8f1d62 +Subproject 688ca8aa6dd7ff48b19c6aea143ac6dd3944e52 diff --git a/extra/penlight b/extra/penlight -Subproject 2f8ffae37c5f14ceb2c3305559a4e3aa04d715d +Subproject 5b0692fa46e7d29f6d65b741f1816c585e247ab diff --git a/install.bat b/install.bat index 6cb1206..dc967c6 100644 --- a/install.bat +++ b/install.bat @@ -41,7 +41,7 @@ cd %TORCH_DISTRO%\pkg\optim && call %LUAROCKS_CMD% make optim-1.0.5-0.rockspec | if not "%TORCH_SETUP_HAS_CUDA%" == "" if not "%TORCH_VS_TARGET%" == "x86" ( echo %ECHO_PREFIX% Found CUDA on your machine. Installing CUDA packages - cd %TORCH_DISTRO%\extra\cutorch && git apply %PATCH_DIR%\cutorch.patch --whitespace=fix & ( call %LUAROCKS_CMD% make rocks\cutorch-scm-1.rockspec || goto :FAIL ) & git apply %PATCH_DIR%\cutorch.patch --reverse --whitespace=fix + cd %TORCH_DISTRO%\extra\cutorch && call %LUAROCKS_CMD% make rocks\cutorch-scm-1.rockspec || goto :FAIL cd %TORCH_DISTRO%\extra\cunn && call %LUAROCKS_CMD% make rocks\cunn-scm-1.rockspec || goto :FAIL ) diff --git a/pkg/image b/pkg/image -Subproject 674c8d184b35d3e46e6bea54465b6c7b390d076 +Subproject c4f41c3156924a7509f9b7b3b5dcb1fa6e3b2f7 diff --git a/pkg/torch b/pkg/torch -Subproject ee860fc177a3880706401bfb59c92c606715d23 +Subproject 08ccedab85a971b73a75d78750fba147c0bcef6 diff --git a/win-files/patch/cutorch.patch b/win-files/patch/cutorch.patch deleted file mode 100644 index 304874e..0000000 --- a/win-files/patch/cutorch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/THC/THCThrustAllocator.cuh b/lib/THC/THCThrustAllocator.cuh -index 3ab2d37..5e8a6c5 100644 ---- a/lib/THC/THCThrustAllocator.cuh -+++ b/lib/THC/THCThrustAllocator.cuh -@@ -1,6 +1,8 @@ - #ifndef THC_THRUST_ALLOCATOR_INC - #define THC_THRUST_ALLOCATOR_INC - -+#include <cstddef> -+ - /// Allocator for Thrust to re-route its internal device allocations - /// to the THC allocator - class THCThrustAllocator { |