merged

20 files changed, 78 insertions, 85 deletions

diff --git a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
index 431c02c..7d45ada 100644
--- a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
+++ b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
@@ -28,9 +28,7 @@ int main(int argc, char* argv[])
     int WIN_SZ=8, SHIFT=64;
     FILE* fp;
     
-    printf("Image 1: ");
     scanf("%s", im1);
-    printf("Image 2: ");
     scanf("%s", im2);
 #ifdef CHECK
     char checkFile[100] = "./expected_C.txt";
@@ -86,17 +84,15 @@ int main(int argc, char* argv[])
     Iright_moved = iSetArray(paddedRows, paddedCols, 0);
 
     range = iMallocHandle(1, 2);
-    printf("starting..\n");
-    for_each_job{
-    retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT, 
-                   minSAD, retDisp, halfWin,
-                   IrightPadded, IleftPadded, Iright_moved,
-                   retSAD, SAD, integralImg,
-                   range);
+    for_each_job {
+        retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT,
+               minSAD, retDisp, halfWin,
+               IrightPadded, IleftPadded, Iright_moved,
+               retSAD, SAD, integralImg,
+               range);
     }
-    printf("ending\n");
 
-#ifdef CHECK   
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int tol, ret=0;
diff --git a/SD-VBS/benchmarks/localization/src/c/script_localization.c b/SD-VBS/benchmarks/localization/src/c/script_localization.c
index 3392320..ed37132 100644
--- a/SD-VBS/benchmarks/localization/src/c/script_localization.c
+++ b/SD-VBS/benchmarks/localization/src/c/script_localization.c
@@ -41,7 +41,6 @@ int main(int argc, char* argv[])
 
     char im1[100];
 
-    printf("Input txt File: ");
     scanf("%s", im1);
 
     fid = readFile(im1);
@@ -83,11 +82,10 @@ int main(int argc, char* argv[])
     F2D *randn;
 
     randn = randWrapper(n,3);
-    printf("start\n");
-    for_each_job{
-        fResetArray(pos,n, 3, 0);
-        fResetArray(vel,n, 3, 0);
-        fResetArray(ones,n,1,1);
+    for_each_job {
+        fResetArray(pos,n, 3, 0);
+        fResetArray(vel,n, 3, 0);
+        fResetArray(ones,n,1,1);
 
         {
             int j;
@@ -95,7 +93,7 @@ int main(int argc, char* argv[])
                 for(j=0; j<3; j++)
                     subsref(vel, i, j) += subsref(randn,i,j) * STDDEV_ODOVel;
 
-        }  
+        }
 
 
  
@@ -486,17 +484,15 @@ int main(int argc, char* argv[])
                 subsref(resultMat,1,icount) = velOut;
                 subsref(resultMat,2,icount) = posOut;
             }
-    
+
             fFreeHandle(sData);
-    
-        
+
             if (asubsref(isEOF,0) == 1)
                break;
         }
     }
-    printf("end..\n");
 
-#ifdef CHECK   
+#ifdef CHECK
     
     // Self checking - use expected.txt from data directory
     {
diff --git a/SD-VBS/benchmarks/mser/src/c/script_mser.c b/SD-VBS/benchmarks/mser/src/c/script_mser.c
index d4a98cd..3e98f86 100644
--- a/SD-VBS/benchmarks/mser/src/c/script_mser.c
+++ b/SD-VBS/benchmarks/mser/src/c/script_mser.c
@@ -33,7 +33,6 @@ int main(int argc, char* argv[])
 
     int ndims, nel, gdl, nmer;
 
-    printf("Input Image: ");
     scanf("%s", im1);
 
     I = readImage(im1);
@@ -74,19 +73,17 @@ int main(int argc, char* argv[])
 
 
     out = iMallocHandle(1, nmer);
-    printf("start\n");
-    for_each_job{
+    for_each_job {
         idx = mser(It, 2, subs_pt, nsubs_pt, strides_pt, visited_pt, dims, 
-                   joins_pt,
+                   joins_pt,
                    regions_pt,
-                   pairs_pt,
+                   pairs_pt,
                    forest_pt,
-                   acc_pt, ell_pt,
+                   acc_pt, ell_pt,
                    out);
     }
-    printf("end..\n");
-    
-#ifdef CHECK   
+
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int tol, ret=0;
diff --git a/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c b/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
index e4f7912..77c6b71 100644
--- a/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
+++ b/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
@@ -28,7 +28,6 @@ int main(int argc, char* argv[])
 
     F2D *imageOut, *tempOut;
     F2D *edgeWeights, *in;
-    printf("Input image: ");
     scanf("%s", im1);
     im = readImage(im1);
 
@@ -50,13 +49,12 @@ int main(int argc, char* argv[])
     u->elts = (uni_elt*)malloc(sizeof(uni_elt)*num_vertices);
     output = iMallocHandle(height, width);
 
-    printf("start\n");
     for_each_job{
-        seg = segment_image(im, sigma, k, min_size, num_ccs, segments, edges, imageOut, tempOut, kernel, edgeWeights, in, ind, u, output);
-        out = seg;
+        seg = segment_image(im, sigma, k, min_size, num_ccs, segments, edges, imageOut, tempOut, kernel, edgeWeights, in, ind, u, output);
+        out = seg;
     }
-    printf("end..\n");
-#ifdef CHECK   
+
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int ret=0;
diff --git a/SD-VBS/benchmarks/sift/src/c/script_sift.c b/SD-VBS/benchmarks/sift/src/c/script_sift.c
index 0b2f106..ab39ae3 100644
--- a/SD-VBS/benchmarks/sift/src/c/script_sift.c
+++ b/SD-VBS/benchmarks/sift/src/c/script_sift.c
@@ -45,7 +45,6 @@ int main(int argc, char* argv[])
     unsigned int* startTime, *endTime, *elapsed;    
     
     char imSrc[100];
-    printf("Input image: ");
     scanf("%s", imSrc);
     im = readImage(imSrc);
     image = fiDeepCopy(im);
@@ -53,16 +52,14 @@ int main(int argc, char* argv[])
     cols = image->width;
 
 
-    printf("start\n");
     for_each_job{
         image = fiDeepCopy(im);
-        normalizeImage(image);
+        normalizeImage(image);
         /** Extract sift features for the normalized image **/
         frames = sift(image);
     }
-    printf("end..\n");
-   
-#ifdef CHECK   
+
+#ifdef CHECK
     {
         int ret=0;
         float tol = 0.2;
diff --git a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
index 00c9a93..b7611f1 100644
--- a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
+++ b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
@@ -16,16 +16,13 @@ int main(int argc, char* argv[])
     I2D *Icur;
     int i, j;
     char im1[100], im2[100];
-    
 
-    printf("Input image: ");
     scanf("%s", im1);
     Icur = readImage(im1);
     rows = Icur->height;
     cols = Icur->width;
-    
-    printf("start\n");
-    for_each_job{
+
+    for_each_job {
         v = harris(Icur);
         interestPnts = getANMS(v, 24);
         int1 = fMallocHandle(interestPnts->height, 1);
@@ -38,10 +35,8 @@ int main(int argc, char* argv[])
 
         Fcur = extractFeatures(Icur, int1, int2);  
     }
-    printf("end..\n");
-    
 
-#ifdef CHECK   
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int ret=0;
diff --git a/SD-VBS/benchmarks/svm/src/c/script_svm.c b/SD-VBS/benchmarks/svm/src/c/script_svm.c
index 62a264d..f1ce963 100644
--- a/SD-VBS/benchmarks/svm/src/c/script_svm.c
+++ b/SD-VBS/benchmarks/svm/src/c/script_svm.c
@@ -70,24 +70,23 @@ int main(int argc, char* argv[])
     #endif
 
 
-    printf("trn file 1: ");
+    // trn file 1
     scanf("%s", im1);
-    trn1 = readFile(im1);   
+    trn1 = readFile(im1);
 
-    printf("trn file 2: ");
+    // trn file 2
     scanf("%s", im1);
-    trn2 = readFile(im1);   
+    trn2 = readFile(im1);
 
-    printf("tst file 1: ");
+    // tst file 1
     scanf("%s", im1);
-    tst1 = readFile(im1);   
+    tst1 = readFile(im1);
 
-    printf("tst file 2: ");
+    // tst file 2
     scanf("%s", im1);
-    tst2 = readFile(im1);       
+    tst2 = readFile(im1);
 
-    printf("start.\n");
-    for_each_job{
+    for_each_job {
         alpha = getAlphaFromTrainSet(N, trn1, trn2, iter);
         a_result = alpha->a_result;
         b_result = alpha->b_result;
@@ -135,8 +134,8 @@ int main(int argc, char* argv[])
             asubsref(result,n) = maxs;
         }
     }
-    printf("end..\n");
-#ifdef CHECK   
+
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int ret=0;
diff --git a/SD-VBS/benchmarks/texture_synthesis/src/c/script_texture_synthesis.c b/SD-VBS/benchmarks/texture_synthesis/src/c/script_texture_synthesis.c
index 01ddefd..2ebb423 100644
--- a/SD-VBS/benchmarks/texture_synthesis/src/c/script_texture_synthesis.c
+++ b/SD-VBS/benchmarks/texture_synthesis/src/c/script_texture_synthesis.c
@@ -27,11 +27,10 @@ int  main(int argc, char **argv)
     image = fiDeepCopy(im);
     init_params(data);
 
-    printf("start.\n");
-    for_each_job{
+    for_each_job {
         create_texture(image, data);
     }
-    printf("end..\n");
+
 #ifdef CHECK
 {
     int ret=0;
@@ -59,7 +58,6 @@ I2D* parse_flags(int argc, char ** argv)
     I2D* image;
     char fileNm[256];
 
-    printf("Input image: ");
     scanf("%s", fileNm);
     image = readImage(fileNm);
     WIDTHin = image->width;
@@ -122,7 +120,7 @@ I2D* parse_flags(int argc, char ** argv)
     localx = 5;
     localy = 5;
 #endif
-    printf("Input size\t\t- (%dx%d)\n", HEIGHTin, WIDTHin);
+//    printf("Input size\t\t- (%dx%d)\n", HEIGHTin, WIDTHin);
 
 //    xloopin = malloc(2*WIDTHin*sizeof(int));
 //    yloopin = malloc(2*HEIGHTin*sizeof(int));
diff --git a/SD-VBS/benchmarks/tracking/src/c/script_tracking.c b/SD-VBS/benchmarks/tracking/src/c/script_tracking.c
index bb48ace..c0af2d7 100644
--- a/SD-VBS/benchmarks/tracking/src/c/script_tracking.c
+++ b/SD-VBS/benchmarks/tracking/src/c/script_tracking.c
@@ -93,22 +93,18 @@ int main(int argc, char* argv[])
 
     I2D* images[counter];
     /** Read input image **/
-    for(count=1; count<=counter; count++)
-    {
-        /** Read image **/
-        printf("Input image %d: ", count);
-        scanf("%s", im1);
+    for(count=1; count<=counter; count++){
+        /** Read Image **/
+        scanf("%s", im1);
         images[count - 1] = readImage(im1);
-        if(count == 1) Ic = readImage(im1);
+        if(count == 1) Ic = readImage(im1);
     }
 
 
     rows = Ic->height;
     cols = Ic->width;
     
-    printf("start\n");   
-    for_each_job{
-        
+    for_each_job {
         /** IMAGE PRE-PROCESSING **/
     
         /** Blur the image to remove noise - weighted avergae filter **/
@@ -230,8 +226,7 @@ int main(int argc, char* argv[])
             fFreeHandle(newpoints);
         }
     }
-    printf("end..\n");
-#ifdef CHECK   
+#ifdef CHECK
     /* Self checking */
     {
         int ret=0;
diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index 144adb2..964ece6 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -18,7 +18,7 @@ endif
 endif
 
 CC=gcc
-override CFLAGS += -DGCC -D$(INPUT) -pthread -DCHECK 
+override CFLAGS += -DGCC -D$(INPUT) -pthread -I../../../../..
 COMMON_DIR := $(TOP_DIR)/common/c
 M_COMMON := $(TOP_DIR)/common/matlab
 M_TOOLBOX=$(TOP_DIR)/common/toolbox
@@ -28,7 +28,11 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK)
 MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK)
 BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK)
 TOOL_DIR := $(TOP_DIR)/tools
-LIBLITMUS := /home/litmus/liblitmus
+LIBLITMUS ?= /home/litmus/liblitmus
+ifneq ($(shell grep "define LITMUS 1" ../../../../../extra.h),)
+        override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
+        override LDFLAGS += -L${LIBLITMUS} -llitmus
+endif
 #The options set below and specific to each benchmark. Disparity takes 2 input images, whereas Tracking can take any >1 input images =.
 
 # Variables exported from the benchmark specific Makefiles:
@@ -55,8 +59,8 @@ COMMON_SRC := $(wildcard $(COMMON_DIR)/*.c)
 # RULES
 
 EXE =
-INCLUDES = -I$(COMMON_DIR) -I$(C_DIR) -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
-COMPILE_C = $(CC) $(CFLAGS) $(INCLUDES) -O2
+INCLUDES = -I$(COMMON_DIR) -I$(C_DIR)
+COMPILE_C = $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) -O2
 #COMPILE_C = $(CC) $(CFLAGS) -DGENERATE_OUTPUT -lm -O2 $(INCLUDES)
 COMPILE_G = $(CC) $(CFLAGS) -g -lm $(INCLUDES)
 COMPILE_PG = $(COMPILE_G) -pg
@@ -107,7 +111,7 @@ compile-preload:
 compile: $(C_SRC)
         @echo 
         @echo -e "Benchmark\t\t- $(BMARK)"
-        @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -L$(LIBLITMUS) -llitmus -lm  -w -o $(BMARK)$(EXE)
+        @$(COMPILE_C) $(COMMON_SRC) $(C_SRC) -lrt -lm  -w -o $(BMARK)$(EXE)
 
 compile-prof: $(C_SRC)
         @echo 
diff --git a/SD-VBS/disparity_qcif b/SD-VBS/disparity_qcif
new file mode 120000
index 0000000..9874fe6
--- /dev/null
+++ b/SD-VBS/disparity_qcif
@@ -0,0 +1 @@
+benchmarks/disparity/data/qcif/disparity
\ No newline at end of file
diff --git a/SD-VBS/localization_qcif b/SD-VBS/localization_qcif
new file mode 120000
index 0000000..d81d27e
--- /dev/null
+++ b/SD-VBS/localization_qcif
@@ -0,0 +1 @@
+benchmarks/localization/data/qcif/localization
\ No newline at end of file
diff --git a/SD-VBS/mser_qcif b/SD-VBS/mser_qcif
new file mode 120000
index 0000000..8121c92
--- /dev/null
+++ b/SD-VBS/mser_qcif
@@ -0,0 +1 @@
+benchmarks/mser/data/qcif/mser
\ No newline at end of file
diff --git a/SD-VBS/multi_ncut_qcif b/SD-VBS/multi_ncut_qcif
new file mode 120000
index 0000000..e3f755f
--- /dev/null
+++ b/SD-VBS/multi_ncut_qcif
@@ -0,0 +1 @@
+benchmarks/multi_ncut/data/qcif/multi_ncut
\ No newline at end of file
diff --git a/SD-VBS/sd-vbsNames.txt b/SD-VBS/sd-vbsNames.txt
new file mode 100644
index 0000000..23b168d
--- /dev/null
+++ b/SD-VBS/sd-vbsNames.txt
@@ -0,0 +1,9 @@
+disparity_qcif                  echo -e "./benchmarks/disparity/data/qcif/1.bmp\\n./benchmarks/disparity/data/qcif/2.bmp"
+localization_qcif               echo "./benchmarks/localization/data/qcif/1.txt"
+mser_qcif                               echo "./benchmarks/mser/data/qcif/1.bmp"
+multi_ncut_qcif                 echo "./benchmarks/multi_ncut/data/qcif/1.bmp"
+sift_qcif                               echo "./benchmarks/sift/data/qcif/1.bmp"
+stitch_qcif                             echo "./benchmarks/stitch/data/qcif/1.bmp"
+svm_qcif                                echo -e "./benchmarks/svm/data/qcif/d16trn_1.txt\\n./benchmarks/svm/data/qcif/d16trn_2.txt\\n./benchmarks/svm/data/qcif/d16tst_1.txt\\n./benchmarks/svm/data/qcif/d16tst_2.txt"
+texture_synthesis_qcif  echo "./benchmarks/texture_synthesis/data/qcif/1.bmp"
+tracking_qcif                   echo -e "./benchmarks/tracking/data/qcif/1.bmp\\n./benchmarks/tracking/data/qcif/2.bmp\\n./benchmarks/tracking/data/qcif/3.bmp\\n./benchmarks/tracking/data/qcif/4.bmp"
diff --git a/SD-VBS/sift_qcif b/SD-VBS/sift_qcif
new file mode 120000
index 0000000..724930b
--- /dev/null
+++ b/SD-VBS/sift_qcif
@@ -0,0 +1 @@
+benchmarks/sift/data/qcif/sift
\ No newline at end of file
diff --git a/SD-VBS/stitch_qcif b/SD-VBS/stitch_qcif
new file mode 120000
index 0000000..0b05a84
--- /dev/null
+++ b/SD-VBS/stitch_qcif
@@ -0,0 +1 @@
+benchmarks/stitch/data/qcif/stitch
\ No newline at end of file
diff --git a/SD-VBS/svm_qcif b/SD-VBS/svm_qcif
new file mode 120000
index 0000000..a8dc348
--- /dev/null
+++ b/SD-VBS/svm_qcif
@@ -0,0 +1 @@
+benchmarks/svm/data/qcif/svm
\ No newline at end of file
diff --git a/SD-VBS/texture_synthesis_qcif b/SD-VBS/texture_synthesis_qcif
new file mode 120000
index 0000000..e198a53
--- /dev/null
+++ b/SD-VBS/texture_synthesis_qcif
@@ -0,0 +1 @@
+benchmarks/texture_synthesis/data/qcif/texture_synthesis
\ No newline at end of file
diff --git a/SD-VBS/tracking_qcif b/SD-VBS/tracking_qcif
new file mode 120000
index 0000000..683191e
--- /dev/null
+++ b/SD-VBS/tracking_qcif
@@ -0,0 +1 @@
+benchmarks/tracking/data/qcif/tracking
\ No newline at end of file