10-24 tmp

1 files changed, 22 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index d2b1c23..6408505 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 case-study:
         sed -i "s/LITMUS 0/LITMUS 1/g" extra.h
-        $(MAKE) -C baseline all
-        $(MAKE) -C dis baseline
+        #$(MAKE) -C baseline all
+        #$(MAKE) -C dis baseline
         $(MAKE) -C SD-VBS/benchmarks compile
 
 benchmarks:
@@ -10,7 +10,8 @@ benchmarks:
         #$(MAKE) -C baseline all
         #$(MAKE) -C all_pairs all
         #$(MAKE) -C dis pairs
-        $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
+#       $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
+        $(MAKE) -C SD-VBS/benchmarks compile
 
 
 benches := svm mser sift texture_synthesis tracking disparity localization multi_ncut stitch
@@ -18,9 +19,13 @@ bench_path := SD-VBS/benchmarks
 dag_path := SD-VBS/dag_binaries
 single_suffix := _qcif_single
 pair_suffix := _qcif_pair
+
+single_suffix_no := _qcif_single_no_litmus
+pair_suffix_no := _qcif_pair_no_litmus
+
 dag-case-study:
-        sudo sed -i "s/LITMUS 0/LITMUS 1/g" extra.h
         sudo mkdir -p SD-VBS/dag_binaries
+        sudo sed -i "s/LITMUS 0/LITMUS 1/g" extra.h
         $(MAKE) -C SD-VBS/benchmarks compile
         @for v in $(benches) ; do \
                 # echo "$(dag_path)/$$v""$(single_suffix)"; \
@@ -31,3 +36,16 @@ dag-case-study:
                 # echo "$(dag_path)/$$v""$(pair_suffix)"; \
         sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(pair_suffix)"; \
     done
+    
+
+        sudo sed -i "s/LITMUS 1/LITMUS 0/g" extra.h
+        $(MAKE) -C SD-VBS/benchmarks compile
+        @for v in $(benches) ; do \
+                # echo "$(dag_path)/$$v""$(single_suffix)"; \
+        sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(single_suffix_no)"; \
+    done
+        $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile
+        @for v in $(benches) ; do \
+                # echo "$(dag_path)/$$v""$(pair_suffix)"; \
+        sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(pair_suffix_no)"; \
+        done