Merge pull request #19 from searchivarius/master

Using NMSLIB code from a release rather than from an obscure branch

install/nmslib.sh

@@ -2,9 +2,11 @@ cd "$(dirname "$0")"
 echo "Installing Python interface for the Non-Metric Space Library"
 # Remove the previous version if existed
 rm -rf nmslib 
-# Note that we use the pserv branch here:
-git clone https://github.com/searchivarius/nmslib.git
-cd nmslib/similarity_search
+# Note that we use version 1.5 here:
+#git clone https://github.com/searchivarius/nmslib.git
+wget https://github.com/searchivarius/nmslib/archive/v1.5.tar.gz
+tar -zxvf v1.5.tar.gz
+cd nmslib-1.5/similarity_search
 git checkout pserv
 apt-get install -y cmake libeigen3-dev libgsl0-dev
 echo "CC: $CC, CXX: $CXX"

install/sift.sh

@@ -2,7 +2,7 @@ cd "$(dirname "$0")"
 wget "ftp://ftp.irisa.fr/local/texmex/corpus/sift.tar.gz"
 tar -xzf sift.tar.gz
 rm -rf sift.tar.gz
-wget "https://raw.githubusercontent.com/searchivarius/NonMetricSpaceLib/master/data/data_conv/convert_texmex_fvec.py"
+wget "https://raw.githubusercontent.com/searchivarius/nmslib/v1.5/data/data_conv/convert_texmex_fvec.py"
 python convert_texmex_fvec.py sift/sift_base.fvecs >> sift.txt
 rm -rf sift