pyrox.dev
lol
1diff -ru -x '*~' gmatrix_orig/src/Makefile gmatrix/src/Makefile
2--- gmatrix_orig/src/Makefile 2014-08-27 02:42:04.000000000 +0900
3+++ gmatrix/src/Makefile 2014-10-25 15:35:29.797202981 +0900
4@@ -21,6 +21,7 @@
5 # to the manual on the gmatrix install instructions)
6 CUDA_LIB_PATH ?= /usr/local/cuda/lib64
7 R_INC_PATH ?= /usr/include/R
8+CUDA_INC_PATH ?= /usr/local/cuda/include
9
10
11 # Nvidia CUDA Compiler
12@@ -49,25 +50,25 @@
13 # Build rules
14 build: $(OUT_OBJ)
15 $(R_CC) $(OUT_OBJ) -o $(OUT_SO) $(LIBS) -L$(CUDA_LIB_PATH)
16-
17+
18 conversions.o:
19- $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH)
20-
21+ $(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
22+
23 manipulation.o:
24- $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH)
25+ $(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
26
27 general.o:
28- $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH)
29+ $(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
30
31 matrix.o:
32- $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH)
33-
34+ $(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
35+
36 ops.o:
37- $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH)
38-
39+ $(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
40+
41 dist.o:
42- $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH)
43-
44+ $(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
45+
46
47 clean:
48 -rm -f *.o core