From 477b507a4f1dbcc9700c686126c992450b6db6b1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 28 Feb 2017 17:31:05 +0300 Subject: [PATCH] rPackages: remove old cuda-related patches gputools doesn't build but because of unrelated linking issues. --- .../r-modules/patches/gmatrix.patch | 48 ------------------- .../r-modules/patches/gputools.patch | 13 ----- 2 files changed, 61 deletions(-) delete mode 100644 pkgs/development/r-modules/patches/gmatrix.patch delete mode 100644 pkgs/development/r-modules/patches/gputools.patch diff --git a/pkgs/development/r-modules/patches/gmatrix.patch b/pkgs/development/r-modules/patches/gmatrix.patch deleted file mode 100644 index 990debb8a42..00000000000 --- a/pkgs/development/r-modules/patches/gmatrix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru -x '*~' gmatrix_orig/src/Makefile gmatrix/src/Makefile ---- gmatrix_orig/src/Makefile 2014-08-27 02:42:04.000000000 +0900 -+++ gmatrix/src/Makefile 2014-10-25 15:35:29.797202981 +0900 -@@ -21,6 +21,7 @@ - # to the manual on the gmatrix install instructions) - CUDA_LIB_PATH ?= /usr/local/cuda/lib64 - R_INC_PATH ?= /usr/include/R -+CUDA_INC_PATH ?= /usr/local/cuda/include - - - # Nvidia CUDA Compiler -@@ -49,25 +50,25 @@ - # Build rules - build: $(OUT_OBJ) - $(R_CC) $(OUT_OBJ) -o $(OUT_SO) $(LIBS) -L$(CUDA_LIB_PATH) -- -+ - conversions.o: -- $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - manipulation.o: -- $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -+ $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} - - general.o: -- $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -+ $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} - - matrix.o: -- $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - ops.o: -- $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - dist.o: -- $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -- -+ $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH} -+ - - clean: - -rm -f *.o core diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch deleted file mode 100644 index 1eb0c8c33ca..00000000000 --- a/pkgs/development/r-modules/patches/gputools.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile ---- gputools_orig/src/Makefile 2013-05-09 01:43:32.000000000 +0900 -+++ gputools/src/Makefile 2014-10-21 21:41:23.067148490 +0900 -@@ -6,6 +6,9 @@ - - R_HOME := $(shell R RHOME) - -+CUDA_INC := $(CUDA_HOME)/include -+CUDA_LIB := $(CUDA_HOME)/lib -+ - #compiler/preprocessor options - INCS := -I. -I"$(CUDA_INC)" -I"$(R_INC)" - PARAMS := $(DEVICEOPTS) -Xcompiler $(CPICFLAGS)