Merge pull request #138 from braceletboy/fix_issue_136

Simplication + Exception Handling + Fix issue #136.

Author: zoq

.gitignore

@@ -8,6 +8,8 @@ datasets/*
 !datasets/download_datasets.sh
 !datasets/dataset-urls.txt
 libraries/*.tar.gz
+libraries/*.zip
+libraries/*.jar
 libraries/*/
 methods/ann/allknn
 methods/flann/allknn

Makefile

@@ -37,16 +37,15 @@ endif
 endif
 
 # Specify the benchmark settings.
-CONFIG := config.yaml
+CONFIG := test.yaml
 BENCHMARKDDIR := benchmark
 LOG := False
+LIB := "shogun"
+SAVE := ""
+LOGLEVEL := "INFO"
 BLOCK := ""
 METHODBLOCK := ""
 UPDATE := False
-FILES := ""
-COPY := False
-USER := ""
-PASSWORD := ""
 BUILD_CORES := 1
 
 # Set the environment variable for the compiled mlpack executables.
@@ -177,7 +176,11 @@ endif
 	$(PYTHON_BIN) $(BENCHMARKDDIR)/test_config.py -c $(CONFIG)
 
 .run:
-	$(PYTHON_BIN) $(BENCHMARKDDIR)/run_benchmark.py -c $(CONFIG) -b $(BLOCK) -l $(LOG) -u $(UPDATE) -m $(METHODBLOCK) --f $(FILES) --n $(COPY) -r $(USER) -p $(PASSWORD)
+ifndef METHODS
+	$(PYTHON_BIN) run.py -c $(CONFIG) -l $(LIB) -s $(SAVE) -o $(LOGLEVEL)
+else
+	$(PYTHON_BIN) run.py -c $(CONFIG) -l $(LIB) -m $(METHODS) -s $(SAVE) -o $(LOGLEVEL)
+endif
 
 .memory:
 	$(PYTHON_BIN) $(BENCHMARKDDIR)/memory_benchmark.py -c $(CONFIG) -b $(BLOCK) -l $(LOG) -u $(UPDATE) -m $(METHODBLOCK)

base.yaml

@@ -0,0 +1,9 @@
+timeout: 300
+flann_path: 'methods/flann/'
+ann_path: 'methods/ann/'
+dlibml_path: 'methods/dlibml/'
+r_path: 'methods/R/'
+weka_path: 'libraries/weka/'
+matlab_path: '/opt/matlab/bin/'
+java_path: 'libraries/share/'
+mlpack_path: 'libraries/bin/'