hnswlib 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6aed34b1cfcf85d2df88ccb2f1a3b417780e0f614fe1a1e3870a060479207ff
-  data.tar.gz: ef5272e25876da853ae49cb26d39ecb7e7d708a25e3442d51e4d998f227334a9
+  metadata.gz: 293c9038e57db28357f77c753988b593ef921a2d8caf7234f4a547547580f2cb
+  data.tar.gz: 668eba08220e29d970f886b91382a335834ac746d9a208d9add986f2ff21fbfc
 SHA512:
-  metadata.gz: 0f9c77270306ea4363d94d45025f7e5e14da66ea5bd9c2ec2b0f62ec578afd2ee75c73a5cce2dac668a70adb9fdc653bfe9eb72e1608928fc648bb73571efd48
-  data.tar.gz: 3d5ab21ea7b9ae8d79f182fb406d98f147d7c534e4be992be238c2c4f450989cb353aa159d62e342ce3e58a7ed8756c59528400554f6229c5298ebbb23414ec3
+  metadata.gz: 1a748a2d3f8291453221b60b55f184b152f56aa35ec5a0830d7b6c6f82adb90e09d757737f0b0527e3404f30c61d7da7f8567c1a7d087045fada991e6152a333
+  data.tar.gz: 4f5fbf6a8b14e4179862f3e9030bf8e08fa971e874e518141261e2f83942fdb96b68217adcb0dbd2a26b12b5684ef7b645fd7b7fa8025b03fc6e08694a14d9c9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.6.1] - 2022-04-30
+
+- Change the `search_knn` method of `BruteforceSearch` to output warning message instead of rasing RuntimeError
+when the number of search results is less than the requested number of neighbors.
+- Fix to raise RuntimeError when failing to open file on the `load_index` method of `BruteforceSearch`.
+- Add guard to not free unallocated memory space.
+
 ## [0.6.0] - 2022-04-16
 
 **Breaking change:**

data/ext/hnswlib/hnswlibext.hpp

@@ -366,14 +366,24 @@ private:
       space = RbHnswlibInnerProductSpace::get_hnsw_ipspace(ivspace);
     }
     hnswlib::HierarchicalNSW<float>* index = get_hnsw_hierarchicalnsw(self);
-    if (index->data_level0_memory_) free(index->data_level0_memory_);
+    if (index->data_level0_memory_) {
+      free(index->data_level0_memory_);
+      index->data_level0_memory_ = nullptr;
+    }
     if (index->linkLists_) {
       for (hnswlib::tableint i = 0; i < index->cur_element_count; i++) {
-        if (index->element_levels_[i] > 0 && index->linkLists_[i]) free(index->linkLists_[i]);
+        if (index->element_levels_[i] > 0 && index->linkLists_[i]) {
+          free(index->linkLists_[i]);
+          index->linkLists_[i] = nullptr;
+        }
       }
       free(index->linkLists_);
+      index->linkLists_ = nullptr;
+    }
+    if (index->visited_list_pool_) {
+      delete index->visited_list_pool_;
+      index->visited_list_pool_ = nullptr;
     }
-    if (index->visited_list_pool_) delete index->visited_list_pool_;
     try {
       index->loadIndex(filename, space);
     } catch (const std::runtime_error& e) {
@@ -590,17 +600,16 @@ private:
     ruby_xfree(vec);
 
     if (result.size() != (size_t)NUM2INT(k)) {
-      rb_raise(rb_eRuntimeError, "Cannot return the results in a contigious 2D array. Probably ef or M is too small.");
-      return Qnil;
+      rb_warning("Cannot return as many search results as the requested number of neighbors.");
     }
 
     VALUE distances_arr = rb_ary_new2(result.size());
     VALUE neighbors_arr = rb_ary_new2(result.size());
 
-    for (int i = NUM2INT(k) - 1; i >= 0; i--) {
+    while (!result.empty()) {
       const std::pair<float, size_t>& result_tuple = result.top();
-      rb_ary_store(distances_arr, i, DBL2NUM((double)result_tuple.first));
-      rb_ary_store(neighbors_arr, i, INT2NUM((int)result_tuple.second));
+      rb_ary_unshift(distances_arr, DBL2NUM((double)result_tuple.first));
+      rb_ary_unshift(neighbors_arr, INT2NUM((int)result_tuple.second));
       result.pop();
     }
 
@@ -627,7 +636,10 @@ private:
       space = RbHnswlibInnerProductSpace::get_hnsw_ipspace(ivspace);
     }
     hnswlib::BruteforceSearch<float>* index = get_hnsw_bruteforcesearch(self);
-    if (index->data_) free(index->data_);
+    if (index->data_) {
+      free(index->data_);
+      index->data_ = nullptr;
+    }
     try {
       index->loadIndex(filename, space);
     } catch (const std::runtime_error& e) {

data/ext/hnswlib/src/bruteforce.h

@@ -29,7 +29,7 @@ namespace hnswlib {
         }
 
         ~BruteforceSearch() {
-            free(data_);
+            if (data_) free(data_);
         }
 
         char *data_;
@@ -129,6 +129,10 @@ namespace hnswlib {
 
 
             std::ifstream input(location, std::ios::binary);
+
+            if (!input.is_open())
+                throw std::runtime_error("Cannot open file");
+
             std::streampos position;
 
             readBinaryPOD(input, maxelements_);

data/ext/hnswlib/src/hnswalg.h

@@ -76,14 +76,15 @@ namespace hnswlib {
         };
 
         ~HierarchicalNSW() {
-
-            free(data_level0_memory_);
-            for (tableint i = 0; i < cur_element_count; i++) {
-                if (element_levels_[i] > 0)
-                    free(linkLists_[i]);
+            if (data_level0_memory_) free(data_level0_memory_);
+            if (linkLists_) {
+                for (tableint i = 0; i < cur_element_count; i++) {
+                    if (element_levels_[i] > 0)
+                        if (linkLists_[i]) free(linkLists_[i]);
+                }
+                free(linkLists_);
             }
-            free(linkLists_);
-            delete visited_list_pool_;
+            if (visited_list_pool_) delete visited_list_pool_;
         }
 
         size_t max_elements_;

data/lib/hnswlib/version.rb

@@ -3,7 +3,7 @@
 # Hnswlib.rb provides Ruby bindings for the Hnswlib.
 module Hnswlib
   # The version of Hnswlib.rb you install.
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   # The version of Hnswlib included with gem.
   HSWLIB_VERSION = '0.6.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hnswlib
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - yoshoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies: []
 description: Hnswlib.rb provides Ruby bindings for the Hnswlib.
 email: