From 5adec621f7d5096c3c45ad596dc9d6625421ff95 Mon Sep 17 00:00:00 2001 From: anapt Date: Thu, 1 Feb 2018 13:37:35 +0200 Subject: [PATCH] macros change for dataset testing --- mean_shift_cuda/meanshift.cu | 16 ++++++++-------- mean_shift_cuda_shared_mem/meanshift.cu | 8 ++++---- mean_shift_serial/serial.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mean_shift_cuda/meanshift.cu b/mean_shift_cuda/meanshift.cu index e76c2bb..733d6dd 100644 --- a/mean_shift_cuda/meanshift.cu +++ b/mean_shift_cuda/meanshift.cu @@ -5,10 +5,10 @@ #include "meanshift_utils.h" #include "meanshift_gpu_utils.h" -int DEVIATION = 1; -int NUMBER_OF_POINTS = 587; -int DIMENSIONS = 2; -const char *POINTS_FILENAME = "../data/X.bin"; +int DEVIATION = 20; +int NUMBER_OF_POINTS = 1024; +int DIMENSIONS = 32; +const char *POINTS_FILENAME = "../data/32"; const char *LABELS_FILENAME = "../data/L.bin"; parameters params; @@ -38,8 +38,8 @@ int main(int argc, char **argv){ printf("\nTotal number of recursions = %d\n", recursions); printf("%s wall clock time = %f\n","Mean Shift", seq_time); - free(vectors[0]); - free(vectors); - free(shifted_points[0]); - free(shifted_points); + //free(vectors[0]); + //free(vectors); + //free(shifted_points[0]); + //free(shifted_points); } diff --git a/mean_shift_cuda_shared_mem/meanshift.cu b/mean_shift_cuda_shared_mem/meanshift.cu index e76c2bb..171c7b3 100644 --- a/mean_shift_cuda_shared_mem/meanshift.cu +++ b/mean_shift_cuda_shared_mem/meanshift.cu @@ -5,10 +5,10 @@ #include "meanshift_utils.h" #include "meanshift_gpu_utils.h" -int DEVIATION = 1; -int NUMBER_OF_POINTS = 587; -int DIMENSIONS = 2; -const char *POINTS_FILENAME = "../data/X.bin"; +int DEVIATION = 20; +int NUMBER_OF_POINTS = 1024; +int DIMENSIONS = 32; +const char *POINTS_FILENAME = "../data/32"; const char *LABELS_FILENAME = "../data/L.bin"; parameters params; diff --git a/mean_shift_serial/serial.c b/mean_shift_serial/serial.c index 87c78fd..5a1cd28 100644 --- a/mean_shift_serial/serial.c +++ b/mean_shift_serial/serial.c @@ -4,10 +4,10 @@ #include "serial_declarations.h" -int DEVIATION = 31000; -int NUMBER_OF_POINTS = 5000; -int DIMENSIONS = 2; -char* POINTS_FILENAME = "../data/s4"; +int DEVIATION = 20; +int NUMBER_OF_POINTS = 1024; +int DIMENSIONS = 32; +char* POINTS_FILENAME = "../data/32"; char* LABELS_FILENAME = "../data/L.bin"; struct timeval startwtime, endwtime; @@ -36,4 +36,4 @@ int main(int argc, char **argv){ //TODO write output points to file -> plot later //save_matrix(shifted_points, iterations); -} \ No newline at end of file +}