memory allocation outside while-loop

mean-shift.c → mean-shift.cu

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdbool.h>
+#include <math.h>
 
 #define X "data/X.bin"
 #define L "data/L.bin"
@@ -113,6 +114,8 @@ void meanshift(double **x, int h, struct parameters *opt){
     /** iterate until convergence **/
     // printf("norm : %f \n", norm(m, ROWS, COLUMNS));
 
+
+
     while (norm(m, ROWS, COLUMNS) > opt->epsilon) {
         iter = iter +1;
         // find pairwise distance matrix (inside radius)
@@ -257,4 +260,6 @@ void print_matrix(double ** array, int rows, int cols){
         }
         printf("\n");
     }
-}
+}
+
+__global__ void

serial.c

@@ -17,13 +17,13 @@ int main(int argc, char **argv){
 
 
     FILE *f;
-    f = fopen(X, "rb");
+//    f = fopen(X, "rb");
-    fseek(f, 0L, SEEK_END);
+//    fseek(f, 0L, SEEK_END);
-    long int pos = ftell(f);
+//    long int pos = ftell(f);
-    fclose(f);
+//    fclose(f);
-    int elements = pos / sizeof(double);  // number of total elements (points*dimension)
+//    int elements = pos / sizeof(double);  // number of total elements (points*dimension)
-    int points = elements/COLUMNS;
+//    int points = elements/COLUMNS;
-    //printf("points : %d \n", points);
+//    //printf("points : %d \n", points);
     f = fopen(X, "rb");
     double ** vectors;
     vectors = alloc_2d_double(ROWS, COLUMNS);
@@ -38,7 +38,7 @@ int main(int argc, char **argv){
     // NOTE : Labels were classified as <class 'numpy.uint8'>
     // variables of type uint8 are stored as 1-byte (8-bit) unsigned integers
     fseek(f, 0L, SEEK_END);
-    pos = ftell(f);
+    long int pos = ftell(f);
     rewind(f);
     //printf("position : %ld \n", pos);
     int label_elements = pos/ sizeof(char);
@@ -50,7 +50,7 @@ int main(int argc, char **argv){
     // MEAN SHIFT OPTIONS
     int h = 1;
     struct parameters params;
-    params.epsilom = 0.0001;
+    params.epsilon = 0.0001;
     params.verbose = false;
     params.display = false;
     struct parameters *opt;

serialDeclarations.c

@@ -24,17 +24,19 @@ void meanshift(double **x, int h, struct parameters *opt){
     // initialize iteration counter
     int iter = 0;
 
-    // printf("%f \n", opt->epsilom);
+    // printf("%f \n", opt->epsilon);
+
+    double ** W = alloc_2d_double(ROWS, ROWS);
+    double * l = malloc(ROWS * sizeof(double));
 
     /** iterate until convergence **/
     // printf("norm : %f \n", norm(m, ROWS, COLUMNS));
 
-    while (norm(m, ROWS, COLUMNS) > opt->epsilom) {
+    while (norm(m, ROWS, COLUMNS) > opt->epsilon) {
         iter = iter +1;
         // find pairwise distance matrix (inside radius)
         /** allocate memory for inside iteration arrays **/
-        double ** W = alloc_2d_double(ROWS, ROWS);
+
-        double * l = malloc(ROWS * sizeof(double));
         // [I, D] = rangesearch(x,y,h);
         for (int i=0; i<ROWS; i++){
             for (int j=0; j<ROWS; j++){
@@ -154,7 +156,7 @@ double calculateDistance(double *y, double *x){
 
 void multiply(double ** matrix1, double ** matrix2, double ** output){
     // W dims are ROWS ROWS and x dims are ROWS COLUMNS
-    
+
     int i, j, k;
     for (i=0; i<ROWS; i++){
         for (j=0; j<COLUMNS; j++){

serialDeclarations.h

@@ -9,7 +9,7 @@
 #define ROWS        600
 
 struct parameters {
-    double epsilom;
+    double epsilon;
     bool verbose;
     bool display;
 };