[mlpack-svn] r16162 - in mlpack/conf/jenkins-conf/benchmark: . methods/ann methods/ann/src methods/flann methods/flann/src
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Jan 23 15:37:17 EST 2014
Author: marcus
Date: Thu Jan 23 15:37:17 2014
New Revision: 16162
Log:
Add command to compile the cpp files and add the ann and flann script to the config file.
Modified:
mlpack/conf/jenkins-conf/benchmark/Makefile
mlpack/conf/jenkins-conf/benchmark/config.yaml
mlpack/conf/jenkins-conf/benchmark/methods/ann/allknn.py
mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp
mlpack/conf/jenkins-conf/benchmark/methods/flann/allknn.py
mlpack/conf/jenkins-conf/benchmark/methods/flann/src/allknn.cpp
Modified: mlpack/conf/jenkins-conf/benchmark/Makefile
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/Makefile (original)
+++ mlpack/conf/jenkins-conf/benchmark/Makefile Thu Jan 23 15:37:17 2014
@@ -54,11 +54,13 @@
export WEKA_CLASSPATH=".:/opt/weka/weka-3-6-9:/opt/weka/weka-3-6-9/weka.jar"
export SHOGUN_PATH=/opt/shogun/shogun-2.1.0-mod
export PYTHONPATH=/opt/scikit-learn/scikit-learn-0.13.1/lib/python3.3/site-packages/:/opt/mlpy/mlpy-3.5.0/lib/python3.3/site-packages/:/opt/shogun/shogun-2.1.0/lib/python3.3/dist-packages/
-export LD_LIBRARY_PATH=/opt/shogun/shogun-2.1.0/lib/
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/ann/ann_1.1.2/lib/:/opt/shogun/shogun-2.1.0/lib/
export MS_PRINT_BIN=/usr/bin/ms_print
export VALGRIND_BIN=/usr/bin/valgrind
export FLANN_PATH=methods/flann/
export ANN_PATH=methods/ann/
+export LIBRARY_PATH=$LIBRARY_PATH:/opt/ann/ann_1.1.2/lib/
+export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/opt/ann/ann_1.1.2/include/:/opt/flann/flann-1.8.4/include/:/usr/include/libxml2/
# Color settings.
NO_COLOR=\033[0m
@@ -167,6 +169,9 @@
javac -cp $(shell echo $(WEKA_CLASSPATH)) -d methods/weka methods/weka/src/*.java
# Compile the shogun K-Means (with initial centroids) Clustering method.
g++ -O0 methods/shogun/src/kmeans.cpp -o methods/shogun/kmeans -I$(SHOGUN_PATH)/include -L$(SHOGUN_PATH)/lib -lshogun
-
+ # Compile the ann scripts.
+ g++ -O0 methods/ann/src/allknn.cpp -o methods/ann/allknn -lANN -lmlpack -lboost_program_options
+ # Compile the FLANN scripts.
+ g++ -O0 methods/flann/src/allknn.cpp -o methods/flann/allknn -lmlpack -lboost_program_options
.checks:
$(PYTHON_BIN) tests/tests.py
Modified: mlpack/conf/jenkins-conf/benchmark/config.yaml
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/config.yaml (original)
+++ mlpack/conf/jenkins-conf/benchmark/config.yaml Thu Jan 23 15:37:17 2014
@@ -1259,3 +1259,35 @@
['datasets/cosExp_X.csv', 'datasets/cosExp_y.csv'],
'datasets/ticdata2000.csv', 'datasets/TomsHardware.csv',
'datasets/mnist_all.csv', 'datasets/tinyImages100k.csv']
+---
+# ANN:
+# A Library for Approximate Nearest Neighbor Searching
+library: ANN
+methods:
+ ALLKNN:
+ run: true
+ script: methods/ann/allknn.py
+ format: [csv, txt]
+ datasets:
+ - files: ['datasets/wine.csv', 'datasets/cloud.csv',
+ 'datasets/wine_qual.csv', 'datasets/isolet.csv',
+ 'datasets/corel-histogram.csv', 'datasets/covtype.csv',
+ 'datasets/1000000-10-randu.csv', 'datasets/mnist_all.csv',
+ 'datasets/Twitter.csv', 'datasets/tinyImages100k.csv']
+ options: '-k 3 -s 42'
+---
+# FLANN:
+# A Library for Fast Library for Approximate Nearest Neighbors
+library: FLANN
+methods:
+ ALLKNN:
+ run: true
+ script: methods/flann/allknn.py
+ format: [csv, txt]
+ datasets:
+ - files: ['datasets/wine.csv', 'datasets/cloud.csv',
+ 'datasets/wine_qual.csv', 'datasets/isolet.csv',
+ 'datasets/corel-histogram.csv', 'datasets/covtype.csv',
+ 'datasets/1000000-10-randu.csv', 'datasets/mnist_all.csv',
+ 'datasets/Twitter.csv', 'datasets/tinyImages100k.csv']
+ options: '-k 3 -s 42'
Modified: mlpack/conf/jenkins-conf/benchmark/methods/ann/allknn.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/ann/allknn.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/ann/allknn.py Thu Jan 23 15:37:17 2014
@@ -121,4 +121,4 @@
@return Elapsed time in seconds.
'''
def GetTime(self, timer):
- return timer.total_time
+ return timer.knn_time
Modified: mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp Thu Jan 23 15:37:17 2014
@@ -23,7 +23,7 @@
PARAM_INT_REQ("k", "Number of nearest neighbors to find.", "k");
PARAM_STRING("query_file", "File containing query points (optional).", "q", "");
PARAM_INT("leaf_size", "Leaf size for tree building.", "l", 20);
-
+PARAM_INT("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
int main(int argc, char **argv)
{
Modified: mlpack/conf/jenkins-conf/benchmark/methods/flann/allknn.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/flann/allknn.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/flann/allknn.py Thu Jan 23 15:37:17 2014
@@ -121,4 +121,4 @@
@return Elapsed time in seconds.
'''
def GetTime(self, timer):
- return timer.total_time
+ return timer.knn_time
Modified: mlpack/conf/jenkins-conf/benchmark/methods/flann/src/allknn.cpp
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/flann/src/allknn.cpp (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/flann/src/allknn.cpp Thu Jan 23 15:37:17 2014
@@ -24,6 +24,7 @@
PARAM_INT_REQ("k", "Number of nearest neighbors to find.", "k");
PARAM_STRING("query_file", "File containing query points (optional).", "q", "");
PARAM_INT("leaf_size", "Leaf size for tree building.", "l", 20);
+PARAM_INT("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
int main(int argc, char** argv)
{
More information about the mlpack-svn
mailing list