diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-04 12:29:22 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-10 10:35:40 +0200 |
commit | 22321f2e58335cd39051c9403975b1015cfa68e0 (patch) | |
tree | 0a15a269aea5103200e6a5115454178aab55f0ee /pkgs/development/r-modules/patches | |
parent | 220e02506fe2ad533eec8b4381f29e52326d2982 (diff) | |
download | nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.gz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.bz2 nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.lz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.xz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.zst nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.zip |
cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f76d849acbe6 ("If cuda headers are presented to nix [...]") and all the following workarounds that was added due to that commit. As far as I can tell[1] this hack isn't needed anymore. And moving includes to $out/usr_include causes pain for cudatoolkit users, so better get rid of it. In patches that did more than the $out/usr_include workaround, I only changed the line back to $out/include instead of re-generating the patches and fully removing the changed line. [1]: I build tested blender and caffe, and temporarily added recurseIntoAttrs to rPackages and haskellPackages so that nox-review could get proper coverage. However, many of the packages do not build even before this patch. I also built CUDA samples with cudatoolkit7 that ran fine.
Diffstat (limited to 'pkgs/development/r-modules/patches')
-rw-r--r-- | pkgs/development/r-modules/patches/CARramps.patch | 12 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/WideLM.patch | 2 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/gputools.patch | 2 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/iFes.patch | 13 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/magma_cuda_include.patch | 12 | ||||
-rw-r--r-- | pkgs/development/r-modules/patches/rpud.patch | 2 |
6 files changed, 3 insertions, 40 deletions
diff --git a/pkgs/development/r-modules/patches/CARramps.patch b/pkgs/development/r-modules/patches/CARramps.patch index 901ab1f69b7..add01b28fc1 100644 --- a/pkgs/development/r-modules/patches/CARramps.patch +++ b/pkgs/development/r-modules/patches/CARramps.patch @@ -1,15 +1,3 @@ -diff -ru -x '*~' CARramps_orig/configure CARramps/configure ---- CARramps_orig/configure 2011-12-01 22:27:06.000000000 +0900 -+++ CARramps/configure 2014-10-25 14:56:04.599337748 +0900 -@@ -2395,7 +2395,7 @@ - - - NCFLAGS="-arch=sm_13 -O2" --CUDA_INC=${CUDA_HOME}/include -+CUDA_INC=${CUDA_HOME}/usr_include - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5 - $as_echo_n "checking for CUDA headers... " >&6; } - as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh` diff -ru -x '*~' CARramps_orig/src/combo1colForR1Q_d.cu CARramps/src/combo1colForR1Q_d.cu --- CARramps_orig/src/combo1colForR1Q_d.cu 2011-12-01 22:27:06.000000000 +0900 +++ CARramps/src/combo1colForR1Q_d.cu 2014-10-25 14:59:06.869299163 +0900 diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch index f86d66bf746..02bbfb7e0da 100644 --- a/pkgs/development/r-modules/patches/WideLM.patch +++ b/pkgs/development/r-modules/patches/WideLM.patch @@ -6,7 +6,7 @@ diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in R_INCS := @R_INCL@ @RCPP_INCL@ CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@ -CU_INCS := -I@CUDA_HOME@/include -+CU_INCS := -I@CUDA_HOME@/usr_include ++CU_INCS := -I@CUDA_HOME@/include CU_ARCH := -gencode arch=compute_20,code=sm_20 #linker options diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch index 61cbcea9370..1eb0c8c33ca 100644 --- a/pkgs/development/r-modules/patches/gputools.patch +++ b/pkgs/development/r-modules/patches/gputools.patch @@ -5,7 +5,7 @@ diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile R_HOME := $(shell R RHOME) -+CUDA_INC := $(CUDA_HOME)/usr_include ++CUDA_INC := $(CUDA_HOME)/include +CUDA_LIB := $(CUDA_HOME)/lib + #compiler/preprocessor options diff --git a/pkgs/development/r-modules/patches/iFes.patch b/pkgs/development/r-modules/patches/iFes.patch deleted file mode 100644 index aca89b8d5a8..00000000000 --- a/pkgs/development/r-modules/patches/iFes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -u3 -r iFes_orig/src/config.mk iFes/src/config.mk ---- iFes_orig/src/config.mk 2014-12-09 14:19:58.000000000 +0300 -+++ iFes/src/config.mk 2015-02-19 22:47:24.426804174 +0300 -@@ -12,7 +12,7 @@ - endif - - # set CUDA_INC to CUDA header dir on your system --CUDA_INC := $(CUDA_HOME)/include -+CUDA_INC := $(CUDA_HOME)/usr_include - - ARCH := $(shell uname -m) - - diff --git a/pkgs/development/r-modules/patches/magma_cuda_include.patch b/pkgs/development/r-modules/patches/magma_cuda_include.patch deleted file mode 100644 index 67552325ae9..00000000000 --- a/pkgs/development/r-modules/patches/magma_cuda_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' magma_orig/configure magma/configure ---- magma_orig/configure 2013-04-03 11:07:42.000000000 +0900 -+++ magma/configure 2014-10-18 21:58:48.745890187 +0900 -@@ -2377,7 +2377,7 @@ - - - NCFLAGS="-arch=sm_13 -O2 -DADD_" --CUDA_INC=${CUDA_HOME}/include -+CUDA_INC=${CUDA_HOME}/usr_include - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5 - $as_echo_n "checking for CUDA headers... " >&6; } - as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh` diff --git a/pkgs/development/r-modules/patches/rpud.patch b/pkgs/development/r-modules/patches/rpud.patch index 45d20e6bd67..bb904b68989 100644 --- a/pkgs/development/r-modules/patches/rpud.patch +++ b/pkgs/development/r-modules/patches/rpud.patch @@ -18,7 +18,7 @@ diff -ru -x '*~' rpud_orig/src/Makefile.in rpud/src/Makefile.in #compiler/preprocessor options -INCS := -I@CUDA_HOME@/include -+INCS := -I@CUDA_HOME@/usr_include ++INCS := -I@CUDA_HOME@/include PARAMS := -Xcompiler "@R_INCLUDE@ @CPICFLAGS@" #linker options |