Browse Source

macros change for dataset testing

master
anapt 7 years ago
parent
commit
5adec621f7
  1. 16
      mean_shift_cuda/meanshift.cu
  2. 8
      mean_shift_cuda_shared_mem/meanshift.cu
  3. 10
      mean_shift_serial/serial.c

16
mean_shift_cuda/meanshift.cu

@ -5,10 +5,10 @@
#include "meanshift_utils.h" #include "meanshift_utils.h"
#include "meanshift_gpu_utils.h" #include "meanshift_gpu_utils.h"
int DEVIATION = 1; int DEVIATION = 20;
int NUMBER_OF_POINTS = 587; int NUMBER_OF_POINTS = 1024;
int DIMENSIONS = 2; int DIMENSIONS = 32;
const char *POINTS_FILENAME = "../data/X.bin"; const char *POINTS_FILENAME = "../data/32";
const char *LABELS_FILENAME = "../data/L.bin"; const char *LABELS_FILENAME = "../data/L.bin";
parameters params; parameters params;
@ -38,8 +38,8 @@ int main(int argc, char **argv){
printf("\nTotal number of recursions = %d\n", recursions); printf("\nTotal number of recursions = %d\n", recursions);
printf("%s wall clock time = %f\n","Mean Shift", seq_time); printf("%s wall clock time = %f\n","Mean Shift", seq_time);
free(vectors[0]); //free(vectors[0]);
free(vectors); //free(vectors);
free(shifted_points[0]); //free(shifted_points[0]);
free(shifted_points); //free(shifted_points);
} }

8
mean_shift_cuda_shared_mem/meanshift.cu

@ -5,10 +5,10 @@
#include "meanshift_utils.h" #include "meanshift_utils.h"
#include "meanshift_gpu_utils.h" #include "meanshift_gpu_utils.h"
int DEVIATION = 1; int DEVIATION = 20;
int NUMBER_OF_POINTS = 587; int NUMBER_OF_POINTS = 1024;
int DIMENSIONS = 2; int DIMENSIONS = 32;
const char *POINTS_FILENAME = "../data/X.bin"; const char *POINTS_FILENAME = "../data/32";
const char *LABELS_FILENAME = "../data/L.bin"; const char *LABELS_FILENAME = "../data/L.bin";
parameters params; parameters params;

10
mean_shift_serial/serial.c

@ -4,10 +4,10 @@
#include "serial_declarations.h" #include "serial_declarations.h"
int DEVIATION = 31000; int DEVIATION = 20;
int NUMBER_OF_POINTS = 5000; int NUMBER_OF_POINTS = 1024;
int DIMENSIONS = 2; int DIMENSIONS = 32;
char* POINTS_FILENAME = "../data/s4"; char* POINTS_FILENAME = "../data/32";
char* LABELS_FILENAME = "../data/L.bin"; char* LABELS_FILENAME = "../data/L.bin";
struct timeval startwtime, endwtime; struct timeval startwtime, endwtime;
@ -36,4 +36,4 @@ int main(int argc, char **argv){
//TODO write output points to file -> plot later //TODO write output points to file -> plot later
//save_matrix(shifted_points, iterations); //save_matrix(shifted_points, iterations);
} }

Loading…
Cancel
Save