X-Git-Url: http://rtime.felk.cvut.cz/gitweb/hercules2020/kcf.git/blobdiff_plain/24a2caa07af7b2fc5a389543c406e9807fe6f1e2..03f7830ef615201e13aeda2c092f8979c488f951:/Makefile

diff --git a/Makefile b/Makefile
index 8bf5c1c..322196b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
 # Makefile to build all the available variants
 
 BUILDS = opencvfft-st opencvfft-async opencvfft-openmp fftw fftw-async fftw-openmp fftw-big fftw-big-openmp cufftw cufftw-big cufftw-big-openmp cufft cufft-openmp cufft-big cufft-big-openmp
-TESTSEQ = bag ball1 car1 book
-TESTFLAGS = default fit128
+TESTSEQ = bmx ball1 crossing racing book
+TESTFLAGS = default fit
 
 all: $(BUILDS)
 
+print_%:
+	@$(foreach v,$($*),echo $(v);)
+
 ninja: build.ninja
 	ninja
 
 $(BUILDS): build.ninja
 	ninja build-$@/build.ninja
-	ninja -C build-$@
+	ninja -C $(CURDIR)/build-$@
 
 clean: build.ninja
 	ninja $@
 
-CMAKE_OPTS += -G Ninja
-
 ## Useful setting - uncomment and modify as needed
 # CMAKE_OPTS += -DOpenCV_DIR=~/opt/opencv-2.4/share/OpenCV
 # CMAKE_OPTS += -DCUDA_VERBOSE_BUILD=ON -DCUDA_NVCC_FLAGS="--verbose;--save-temps"
@@ -106,17 +107,17 @@ rule REGENERATE
   description = Regenerating $$out
   generator = 1
 rule CMAKE
-  command = cd $$subdir && cmake $(CMAKE_OPTS) $$opts ..
+  command = cd $$subdir && cmake -G Ninja $(CMAKE_OPTS) $$opts ..
 rule NINJA
   # Absolute path in -C allows Emacs to properly jump to error message locations
   command = ninja -C $(CURDIR)/$$subdir
   restat = 1
 rule TEST_SEQ
   # Errors are ignored - they will be reported by PRINT_RESULTS
-  command = build-$$build/kcf_vot $$flags $$seq $(if $(TRAVIS),2>&1) >$$out $(if $(TRAVIS),| grep -v libdc1394) || :
+  command = build-$$build/kcf_vot $$flags $$seq $(if $(TRAVIS),2>&1) >$$out $(if $(TRAVIS),| grep -v libdc1394); true
 rule PRINT_RESULTS
   description = Print results
-  command = ./wvtool -w125 -v run ./print-test-results $$in
+  command = ./wvtool -w120 -v run ./print-test-results $$in
 rule PLOT_RESULTS
   description = Plot results
   command = ./graphGen.sh -f -s $$in
@@ -149,5 +150,5 @@ define ninja-testcase
 build build-$(1)/kcf_vot-$(2)-$(3).log: TEST_SEQ build-$(1)/kcf_vot $(filter-out %/output.txt,$(wildcard vot2016/$(2)/*)) vot2016/$(2)
   build = $(1)
   seq = vot2016/$(2)
-  flags = $(if $(3:fit128=),,--fit=128)
+  flags = $(if $(3:fit128=),,--fit=128)$(if $(3:fit=),,--fit)
 endef