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

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

Author: marcus
Date: Mon Jul 29 06:18:47 2013
New Revision: 15572

Log:
Add PYTHONPATH and LD_LIBRARY_PATH to the general config block.

Modified:
   mlpack/conf/jenkins-conf/benchmark/benchmark/run_benchmark.py
   mlpack/conf/jenkins-conf/benchmark/small_config.yaml

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	Mon Jul 29 06:18:47 2013
@@ -180,6 +180,21 @@
         os.environ["MATLAB_BIN"] = value
       elif key == "MATLABPATH":
         os.environ["MATLABPATH"] = value
+      elif key == "PYTHONPATH":
+        try:
+          PYTHONPATH = os.environ["PYTHONPATH"]
+        except KeyError:
+          os.environ["PYTHONPATH"] = value
+        else:
+          os.environ["PYTHONPATH"] = PYTHONPATH + ":" + value
+      elif key == "LD_LIBRARY_PATH":
+        try:
+          LD_LIBRARY_PATH = os.environ["LD_LIBRARY_PATH"]
+        except KeyError:
+          os.environ["LD_LIBRARY_PATH"] = value
+        else:
+          os.environ["LD_LIBRARY_PATH"] = LD_LIBRARY_PATH + ":" + value
+
 
   # Iterate through all libraries.
   for method, sets in streamData.items():

Modified: mlpack/conf/jenkins-conf/benchmark/small_config.yaml
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/small_config.yaml	(original)
+++ mlpack/conf/jenkins-conf/benchmark/small_config.yaml	Mon Jul 29 06:18:47 2013
@@ -8,6 +8,8 @@
     MLPACK_BIN: '/usr/local/bin/'
     MATLAB_BIN: '/opt/matlab/bin/'
     MATLABPATH: 'methods/matlab/'
+    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'
+    LD_LIBRARY_PATH: '/opt/shogun/shogun-2.1.0/lib'
 ---
 # MLPACK:
 # A Scalable C++  Machine Learning Library