[mlpack-svn] r15576 - in mlpack/conf/jenkins-conf/benchmark: . benchmark

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: marcus
Date: Tue Jul 30 06:21:55 2013
New Revision: 15576

Log:
Update Makefile to use the log and block feature.

Modified:
   mlpack/conf/jenkins-conf/benchmark/Makefile
   mlpack/conf/jenkins-conf/benchmark/benchmark/run_benchmark.py

Modified: mlpack/conf/jenkins-conf/benchmark/Makefile
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/Makefile	(original)
+++ mlpack/conf/jenkins-conf/benchmark/Makefile	Tue Jul 30 06:21:55 2013
@@ -4,6 +4,8 @@
 
 CONFIG := config.yaml
 BENCHMARKDDIR := benchmark
+LOG:=False
+BLOCK:=""
 
 # Specify the path for the libraries.
 export MLPACK_BIN=/usr/local/bin/
@@ -43,7 +45,7 @@
 	$(PYTHON_BIN) $(BENCHMARKDDIR)/test_config.py -c $(CONFIG)
 
 run:
-	$(PYTHON_BIN) $(BENCHMARKDDIR)/run_benchmark.py -c $(CONFIG)
+	$(PYTHON_BIN) $(BENCHMARKDDIR)/run_benchmark.py -c $(CONFIG) -b $(BLOCK) -l $(LOG)
 
 memory:
 	$(PYTHON_BIN) $(BENCHMARKDDIR)/memory_benchmark.py -c $(CONFIG)

Modified: mlpack/conf/jenkins-conf/benchmark/benchmark/run_benchmark.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/benchmark/run_benchmark.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/benchmark/run_benchmark.py	Tue Jul 30 06:21:55 2013
@@ -304,10 +304,11 @@
   parser.add_argument('-b','--blocks', help='Run only the specified blocks.', 
       required=False)
   parser.add_argument('-l','--log', help='Save the results in the logfile.', 
-      required=False, action='store_true')
+      required=False)
 
   args = parser.parse_args()
 
   if args:
     SystemInformation()
-    Main(args.config, args.blocks, args.log)
+    log = True if args.log == "True" else False
+    Main(args.config, args.blocks, log)