Install Script for R

Makefile

@@ -184,8 +184,6 @@ endif
 	# Compile the mlpack scripts.  (Can't do this until ANN is released or a
 	# git version of mlpack is used.)
 	#cd methods/mlpack/src/ && ./build_scripts.sh
-	# Compile the DLIBML scripts.
-	g++ -O0 -std=c++11 methods/dlibml/src/ALLKNN.cpp -o methods/dlibml/dlibml_allknn -I"$(INCLUDEPATH)" -L"$(LIBPATH)" -ldlib -lmlpack -lboost_program_options -lblas -llapack
 
 .setup:
 	cd libraries/ && ./download_packages.sh && ./install_all.sh $(BUILD_CORES)

config.yaml

@@ -2803,22 +2803,4 @@ methods:
                            ['datasets/abalone7_train.csv', 'datasets/abalone7_test.csv', 'datasets/abalone7_labels.csv'],
                            ['datasets/satellite_train.csv', 'datasets/satellite_test.csv', 'datasets/satellite_labels.csv'],
                            ['datasets/ecoli_train.csv', 'datasets/ecoli_test.csv', 'datasets/ecoli_labels.csv'] ]
----
-# dlib-ml
-library: dlibml
-methods:
-    ALLKNN:
-            run: ['metric']
-            iteration: 3
-            script: methods/dlibml/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
-
 

libraries/install_all.sh

@@ -48,6 +48,7 @@ fi
 ./nearpy_install.sh $1
 if [ "$?" -ne "0" ]; then
   echo "Error installing nearpy!";
+  exit 1;
 fi
 ./annoy_install.sh $1
 if [ "$?" -ne "0" ]; then
@@ -79,4 +80,8 @@ if [ "$?" -ne "0" ]; then
   echo "Error installing dlib!";
   exit 1;
 fi
-
+./r_install.sh $1
+if [ "$?" -ne "0" ]; then
+  echo "Error installing dlib!";
+  exit 1;
+fi

libraries/package-urls.txt

@@ -12,3 +12,4 @@ annoy https://pypi.python.org/packages/3a/14/e733caa00f20544d4f3685434073a6911f4
 mrpt https://github.com/teemupitkanen/mrpt/archive/master.tar.gz
 milk https://github.com/luispedro/milk/archive/release-0.6.1.tar.gz
 dlibml https://github.com/davisking/dlib/archive/v19.4.tar.gz
+R https://cran.r-project.org/src/base/R-3/R-3.4.1.tar.gz

libraries/r_install.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Wrapper script to unpack and build R.
+#
+# Include files will be installed to ../include/.
+# Library files will be installed to ../lib/.
+#
+# One R.tar.gz file should be located in this directory.
+tars=`ls R.tar.gz | wc -l`;
+if [ "$tars" -eq "0" ];
+then
+  echo "No source R.tar.gz found in libraries/!"
+  exit 1
+fi
+
+# Remove any old directory.
+rm -rf R/
+mkdir R/
+tar -xzpf R.tar.gz --strip-components=1 -C R/
+
+cd R/
+./configure --prefix=/opt/R/3.4.1 --enable-R-shlib
+make
+make install

tests/benchmark_allknn.py

@@ -299,39 +299,5 @@ def test_RunMetrics(self):
     self.assertTrue(result["Runtime"] > 0)
     self.assertTrue(result["ComputingNeighbors"] > 0)
 
-'''
-Test the dlibml All K-Nearest-Neighbors script.
-'''
-class ALLKNN_DLIBML_TEST(unittest.TestCase):
-
-  '''
-  Test initialization.
-  '''
-  def setUp(self):
-    self.dataset = "datasets/wine.csv"
-    self.verbose = False
-    self.timeout = 240
-
-    module = Loader.ImportModuleFromPath("methods/dlibml/ALLKNN.py")
-    obj = getattr(module, "ALLKNN")
-    self.instance = obj(self.dataset, verbose=self.verbose, timeout=self.timeout)
-
-  '''
-  Test the constructor.
-  '''
-  def test_Constructor(self):
-    self.assertEqual(self.instance.verbose, self.verbose)
-    self.assertEqual(self.instance.timeout, self.timeout)
-    self.assertEqual(self.instance.dataset, self.dataset)
-
-  '''
-  Test the 'RunMetrics' function.
-  '''
-  def test_RunMetrics(self):
-    result = self.instance.RunMetrics({ "k": 3 })
-    print(result)
-    self.assertTrue(result["Runtime"] > 0)
-
-
 if __name__ == '__main__':
   unittest.main()