From 9b282dda06f076a2292c8ada33de5fbe194a825a Mon Sep 17 00:00:00 2001 From: searchivarius Date: Fri, 20 May 2016 12:34:11 -0400 Subject: [PATCH 1/3] Now using NSMLIB 1.5 --- install/nmslib.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install/nmslib.sh b/install/nmslib.sh index 1705e69ea..333dea401 100755 --- a/install/nmslib.sh +++ b/install/nmslib.sh @@ -2,8 +2,10 @@ 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 +# 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/similarity_search git checkout pserv apt-get install -y cmake libeigen3-dev libgsl0-dev From e3458e21e09798bcd76f54eef26dedc5df320860 Mon Sep 17 00:00:00 2001 From: searchivarius Date: Fri, 20 May 2016 13:08:25 -0400 Subject: [PATCH 2/3] cd to the right dir --- install/nmslib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/nmslib.sh b/install/nmslib.sh index 333dea401..70dc870f1 100755 --- a/install/nmslib.sh +++ b/install/nmslib.sh @@ -6,7 +6,7 @@ rm -rf nmslib #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/similarity_search +cd nmslib-1.5/similarity_search git checkout pserv apt-get install -y cmake libeigen3-dev libgsl0-dev echo "CC: $CC, CXX: $CXX" From d86b7769294f92add3abecc8d2350fd292f04602 Mon Sep 17 00:00:00 2001 From: searchivarius Date: Fri, 20 May 2016 13:26:27 -0400 Subject: [PATCH 3/3] Let's use SIFT converter from a fixed release rather than master --- install/sift.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/sift.sh b/install/sift.sh index 41182acdb..6e7775228 100644 --- a/install/sift.sh +++ b/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