[mlpack-svn] r15663 - mlpack/conf/jenkins-conf/benchmark/methods/scikit

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Aug 26 06:23:37 EDT 2013


Author: marcus
Date: Mon Aug 26 06:23:37 2013
New Revision: 15663

Log:
Use the correct method name to start the scikit benchmark.

Modified:
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/allknn.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/gmm.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/ica.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/kernel_pca.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/kmeans.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/lars.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/linear_regression.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/nbc.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/nmf.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/pca.py
   mlpack/conf/jenkins-conf/benchmark/methods/scikit/sparse_coding.py

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/allknn.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/allknn.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/allknn.py	Mon Aug 26 06:23:37 2013
@@ -99,7 +99,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunAllKnnScikit, self.timeout)
 
   '''
   Perform All K-Nearest-Neighbors. If the method has been successfully completed 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/gmm.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/gmm.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/gmm.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def GMMScikit(self, options):
-    def RunGMMScikit():
+    def RunGMMScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -71,7 +71,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunGMMScikit, self.timeout)
 
   '''
   Perform Gaussian Mixture Model. If the method has been successfully completed 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/ica.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/ica.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/ica.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def ICAScikit(self, options):
-    def RunICAScikit():
+    def RunICAScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -65,7 +65,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunICAScikit, self.timeout)
 
   '''
   Perform independent component analysis. If the method has been successfully 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/kernel_pca.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/kernel_pca.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/kernel_pca.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def KPCAScikit(self, options):
-    def RunKPCAScikit():
+    def RunKPCAScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -94,7 +94,7 @@
       q.put(time)
       return -1
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunKPCAScikit, self.timeout)
 
   '''
   Perform Kernel Principal Components Analysis. If the method has been 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/kmeans.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/kmeans.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/kmeans.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def KMeansScikit(self, options):
-    def RunKMeansScikit():
+    def RunKMeansScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -96,7 +96,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunKMeansScikit, self.timeout)
 
   '''
   Perform K-Means Clustering. If the method has been successfully completed 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/lars.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/lars.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/lars.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def LARSScikit(self, options):
-    def RunLARSScikit():
+    def RunLARSScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -68,7 +68,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunLARSScikit, self.timeout)
 
   '''
   Perform Least Angle Regression. If the method has been successfully completed 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/linear_regression.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/linear_regression.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/linear_regression.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def LinearRegressionScikit(self, options):
-    def RunLinearRegressionScikit():
+    def RunLinearRegressionScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -71,7 +71,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunLinearRegressionScikit, self.timeout)
 
   '''
   Perform Linear Regression. If the method has been successfully completed 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/nbc.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/nbc.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/nbc.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def NBCScikit(self, options):
-    def RunNBCScikit():
+    def RunNBCScikit(q):
       totalTimer = Timer()
       
       Log.Info("Loading dataset", self.verbose)
@@ -69,7 +69,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunNBCScikit, self.timeout)
 
   '''
   Perform Naive Bayes Classifier. If the method has been successfully 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/nmf.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/nmf.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/nmf.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def NMFScikit(self, options):
-    def RunNMFScikit():
+    def RunNMFScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -84,7 +84,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunNMFScikit, self.timeout)
 
   '''
   Perform Non-negative Matrix Factorization. If the method has been successfully 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/pca.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/pca.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/pca.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def PCAScikit(self, options):
-    def RunPCAScikit():
+    def RunPCAScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -79,7 +79,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunPCAScikit, self.timeout)
 
   '''
   Perform Principal Components Analysis. If the method has been successfully 

Modified: mlpack/conf/jenkins-conf/benchmark/methods/scikit/sparse_coding.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/scikit/sparse_coding.py	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/scikit/sparse_coding.py	Mon Aug 26 06:23:37 2013
@@ -46,7 +46,7 @@
   @return - Elapsed time in seconds or -1 if the method was not successful.
   '''
   def SparseCodingScikit(self, options):
-    def RunSparseCodingScikit():
+    def RunSparseCodingScikit(q):
       totalTimer = Timer()
 
       # Load input dataset.
@@ -67,7 +67,7 @@
       q.put(time)
       return time
 
-    return timeout(RunAllKnnMlpy, self.timeout)
+    return timeout(RunSparseCodingScikit, self.timeout)
 
   '''
   Perform Sparse Coding. If the method has been successfully completed 



More information about the mlpack-svn mailing list