diff --git a/mean_shift_cuda/Makefile b/mean_shift_cuda/Makefile index d7c9a56..f25d776 100644 --- a/mean_shift_cuda/Makefile +++ b/mean_shift_cuda/Makefile @@ -3,9 +3,9 @@ SHELL := /bin/bash # ============================================ # COMMANDS -CC = nvcc +CC = /usr/local/cuda/bin/nvcc -ccbin gcc RM = rm -f -CFLAGS=-lm -O3 -Wall -I. +CFLAGS=-lm -O3 -I. OBJ=meanshift.o meanshift_declarations.o DEPS=meanshift_declarations.h diff --git a/mean_shift_cuda/meanshift.c b/mean_shift_cuda/meanshift.c index 2826a03..8f4a645 100644 --- a/mean_shift_cuda/meanshift.c +++ b/mean_shift_cuda/meanshift.c @@ -11,15 +11,12 @@ int NUMBER_OF_POINTS = 600; int DIMENSIONS = 2; -char* POINTS_FILENAME = "data/X.bin"; -char* LABELS_FILENAME = "data/L.bin"; +char* POINTS_FILENAME = "../data/X.bin"; +char* LABELS_FILENAME = "../data/L.bin"; struct timeval startwtime, endwtime; double seq_time; -int meanshift(double **original_points, double ***shifted_points, int h - , parameters *opt, int iteration); - __device__ double norm(double **matrix, int rows, int cols){ double sum=0, temp_mul=0; @@ -92,8 +89,6 @@ int main(int argc, char **argv){ //save_matrix(shifted_points, iterations); } - - int meanshift(double **original_points, double ***shifted_points, int h , parameters *opt, int iteration){ diff --git a/mean_shift_cuda/meanshift_declarations.c b/mean_shift_cuda/meanshift_declarations.c index e6a8f89..b3a5100 100644 --- a/mean_shift_cuda/meanshift_declarations.c +++ b/mean_shift_cuda/meanshift_declarations.c @@ -24,20 +24,6 @@ void get_args(int argc, char **argv, int *h){ LABELS_FILENAME = argv[5]; } - -// TODO check why there's is a difference in the norm calculate in matlab -double norm(double **matrix, int rows, int cols){ - double sum=0, temp_mul=0; - for (int i=0; i