diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/development/r-modules/patches/WideLM.patch | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/development/r-modules/patches/WideLM.patch')
| -rw-r--r-- | pkgs/development/r-modules/patches/WideLM.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch deleted file mode 100644 index 02bbfb7e0da..00000000000 --- a/pkgs/development/r-modules/patches/WideLM.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in ---- WideLM_orig/src/Makefile.in 2012-02-17 04:28:05.000000000 +0900 -+++ WideLM/src/Makefile.in 2014-10-25 18:54:49.110011921 +0900 -@@ -12,12 +12,12 @@ - #compiler/preprocessor options - R_INCS := @R_INCL@ @RCPP_INCL@ - CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@ --CU_INCS := -I@CUDA_HOME@/include -+CU_INCS := -I@CUDA_HOME@/include - CU_ARCH := -gencode arch=compute_20,code=sm_20 - - #linker options --LD_PARAMS := -Xlinker "@RCPP_LDFLAGS@" --RCU_LIBS := @R_LIB@ -L@CU_LIBDIR@ -lcublas -+LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR" -+RCU_LIBS := -Xlinker "-L@CU_LIBDIR@ -lcublas" - - all : WideLM.so - |