[mlpack-svn] r15381 - in mlpack/conf/jenkins-conf/benchmark: methods/mlpack util

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

Author: marcus
Date: Tue Jul  2 06:50:04 2013
New Revision: 15381

Log:
Set correct output in the parser class and options for memory profiling.

Modified:
   mlpack/conf/jenkins-conf/benchmark/methods/mlpack/pca.py
   mlpack/conf/jenkins-conf/benchmark/util/parser.py

Modified: mlpack/conf/jenkins-conf/benchmark/methods/mlpack/pca.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/mlpack/pca.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/mlpack/pca.py	Tue Jul  2 06:50:04 2013
@@ -68,7 +68,7 @@
 	'''
 	def __del__(self):		
 		Log.Info("Clean up.", self.verbose)
-		filelist = ["gmon.out", "output.csv", "PCA.massif"]
+		filelist = ["gmon.out", "output.csv", "PCA.mout"]
 		for f in filelist:
 			if os.path.isfile(f):
 				os.remove(f)		
@@ -82,14 +82,14 @@
 	@return Returns False if the method was not successful, if the method was 
 	successful save the report file in the specified file.
 	'''
-	def RunMemoryProfiling(self, options = "--depth=3"):
+	def RunMemoryProfiling(self, methodOptions, massifOptions = "--depth=3"):
 		Log.Info("Perform PCA Memory Profiling.", self.verbose)
 
 		# Split the command using shell-like syntax.
 		cmd = shlex.split(self.path + "pca -i " + self.dataset + 
-				" -o output.csv -v " + options)
+				" -o output.csv -v " + methodOptions)
 
-		return Profiler.MassifMemoryUsage(cmd, "PCA.massif")
+		return Profiler.MassifMemoryUsage(cmd, "PCA.mout", options = massifOptions)
 		
 	'''
   Perform Principal Components Analysis. If the method has been successfully 

Modified: mlpack/conf/jenkins-conf/benchmark/util/parser.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/util/parser.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/util/parser.py	Tue Jul  2 06:50:04 2013
@@ -188,7 +188,7 @@
 	@ return False
 	'''
 	def NotAvailableErrorMsg(self, fileName):
-		Log.Fatal("The file: " + fileName + "is not available.")
+		Log.Fatal("The file: " + fileName + " is not available.")
 		return False
 
 	'''