Merge branch 'sd-vbs' of ssh://rtsrv.cs.unc.edu/public/mc2-scripts-and-benchmarks into sd-vbs

2 files changed, 3 insertions, 26 deletions

diff --git a/SD-VBS/benchmarks/sift/data/cif/12345.txt b/SD-VBS/benchmarks/sift/data/cif/12345.txt
deleted file mode 100644
index daa6c4e..0000000
--- a/SD-VBS/benchmarks/sift/data/cif/12345.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-sift-cif none 24 none 5 104051864 12345 0 0 0
-sift-cif none 24 none 5 96525328 12345 1 0 0
-sift-cif none 24 none 5 96277128 12345 2 0 0
-sift-cif none 24 none 5 96178952 12345 3 0 0
-sift-cif none 24 none 5 95490272 12345 4 0 0
-sift-cif none 10 none 5 103447040 12345 0 0 0
-sift-cif none 10 none 5 96958904 12345 1 0 0
-sift-cif none 10 none 5 96584488 12345 2 0 0
-sift-cif none 10 none 5 96588392 12345 3 0 0
-sift-cif none 10 none 5 96627096 12345 4 0 0
-sift-cif none 10 none 5 103573096 12345 0 0 0
-sift-cif none 10 none 5 96952456 12345 1 0 0
-sift-cif none 10 none 5 96591240 12345 2 0 0
-sift-cif none 10 none 5 96764048 12345 3 0 0
-sift-cif none 10 none 5 96623720 12345 4 0 0
-sift-cif none 25 none 5 102780536 12345 0 0 0
-sift-cif none 25 none 5 96114424 12345 1 0 0
-sift-cif none 25 none 5 95936440 12345 2 0 0
-sift-cif none 25 none 5 95819504 12345 3 0 0
-sift-cif none 25 none 5 95930288 12345 4 0 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;