Merge pull request #260 from dyashuni/develop

Move setup.py into root folder

Author: yurymalkov

.gitignore

@@ -1,4 +1,7 @@
-python_bindings/hnswlib.egg-info/
-python_bindings/build/
-python_bindings/dist/
-python_bindings/tmp/
+hnswlib.egg-info/
+build/
+dist/
+tmp/
+python_bindings/tests/__pycache__/
+*.pyd
+hnswlib.cpython*.so

.travis.yml

@@ -1,16 +1,38 @@
 language: python
 
-matrix:
+jobs:
   include:
-    - python: 3.6
-    - python: 3.7
+    - name: Linux Python 3.6
+      os: linux
+      python: 3.6
+    
+    - name: Linux Python 3.7
+      os: linux
+      python: 3.7
+    
+    - name: Windows Python 3.6
+      os: windows
+      language: shell    # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python --version 3.6.0
+        - python -m pip install --upgrade pip
+        - python --version
+      env: PATH=/c/Python36:/c/Python36/Scripts:$PATH
+    
+    - name: Windows Python 3.7
+      os: windows
+      language: shell    # 'language: python' is an error on Travis CI Windows
+      before_install:
+        - choco install python --version 3.7.0
+        - python -m pip install --upgrade pip
+        - python --version
+      env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
+
 install:
   - |
-    cd python_bindings
     pip install -r requirements.txt
     python setup.py install
 
 script:
   - |
-    cd python_bindings
     python setup.py test

python_bindings/MANIFEST.in renamed to MANIFEST.in

@@ -9,6 +9,6 @@ test:
 	python3 setup.py test
 
 clean:
-	rm -rf *.egg-info build dist var first_half.bin tests/__pycache__ hnswlib.cpython-36m-darwin.so
+	rm -rf *.egg-info build dist tmp var tests/__pycache__ hnswlib.cpython*.so
 
 .PHONY: dist

python_bindings/Makefile renamed to Makefile

@@ -214,7 +214,6 @@ You can install from sources:
 ```bash
 apt-get install -y python-setuptools python-pip
 pip3 install pybind11 numpy setuptools
-cd python_bindings
 python3 setup.py install
 ```
 
@@ -244,13 +243,15 @@ Contributions are highly welcome!
 Please make pull requests against the `develop` branch.
 
 ### 200M SIFT test reproduction 
-To download and extract the bigann dataset:
+To download and extract the bigann dataset (from root directory):
 ```bash
 python3 download_bigann.py
 ```
 To compile:
 ```bash
-cmake .
+mkdir build
+cd build
+cmake ..
 make all
 ```
 

README.md

@@ -2,7 +2,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
-#include "hnswlib/hnswlib.h"
+#include "hnswlib.h"
 #include <thread>
 #include <atomic>
 #include <stdlib.h>

python_bindings/bindings.cpp

@@ -0,0 +1 @@
+../setup.py

python_bindings/hnswlib

@@ -1,3 +1,4 @@
+import os
 import unittest
 
 
@@ -43,16 +44,16 @@ def testRandomSelf(self):
         self.assertAlmostEqual(np.mean(labels.reshape(-1) == np.arange(len(data1))),1.0,3)
 
         # Serializing and deleting the index:
-        index_path='first_half.bin'
+        index_path = 'first_half.bin'
         print("Saving index to '%s'" % index_path)
-        p.save_index("first_half.bin")
+        p.save_index(index_path)
         del p
 
         # Reiniting, loading the index
         p = hnswlib.Index(space='l2', dim=dim)  # you can change the sa
 
-        print("\nLoading index from 'first_half.bin'\n")
-        p.load_index("first_half.bin")
+        print("\nLoading index from '%s'\n" % index_path)
+        p.load_index(index_path)
 
         print("Adding the second batch of %d elements" % (len(data2)))
         p.add_items(data2)
@@ -61,6 +62,8 @@ def testRandomSelf(self):
         labels, distances = p.knn_query(data, k=1)
 
         self.assertAlmostEqual(np.mean(labels.reshape(-1) == np.arange(len(data))),1.0,3)
+        
+        os.remove(index_path)
 
 
 if __name__ == "__main__":

python_bindings/setup.py

@@ -1,3 +1,4 @@
+import os
 import unittest
 
 
@@ -56,9 +57,9 @@ def testRandomSelf(self):
         # Serializing and deleting the index.
         # We need the part to check that serialization is working properly.
 
-        index_path='first_half.bin'
+        index_path = 'first_half.bin'
         print("Saving index to '%s'" % index_path)
-        p.save_index("first_half.bin")
+        p.save_index(index_path)
         print("Saved. Deleting...")
         del p
         print("Deleted")
@@ -68,8 +69,8 @@ def testRandomSelf(self):
         print("Reiniting")
         p = hnswlib.Index(space='l2', dim=dim)
 
-        print("\nLoading index from 'first_half.bin'\n")
-        p.load_index("first_half.bin")
+        print("\nLoading index from '%s'\n" % index_path)
+        p.load_index(index_path)
         p.set_ef(100)
 
         print("Adding the second batch of %d elements" % (len(data2)))
@@ -109,16 +110,20 @@ def testRandomSelf(self):
         print("All the data in data1 are removed")
 
         # checking saving/loading index with elements marked as deleted
-        p.save_index("with_deleted.bin")
+        del_index_path = "with_deleted.bin"
+        p.save_index(del_index_path)
         p = hnswlib.Index(space='l2', dim=dim)
-        p.load_index("with_deleted.bin")
+        p.load_index(del_index_path)
         p.set_ef(100)
 
         labels1_after, _ = p.knn_query(data1, k=1)
         for la in labels1_after:
             for lb in labels1:
                 if la[0] == lb[0]:
                     self.assertTrue(False)
+      
+      os.remove(index_path)
+      os.remove(del_index_path)