Cleanup

Author: michaelbautin

hnswlib/hnswalg.h

@@ -124,9 +124,9 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
         offsetLevel0_ = 0;
 
         data_level0_memory_ = (char *) malloc(max_elements_ * size_data_per_element_);
-        // TODO(bautin): handle
-        // if (data_level0_memory_ == nullptr)
-        //     return Status("Not enough memory");
+        if (data_level0_memory_ == nullptr) {
+            HNSWLIB_THROW_RUNTIME_ERROR("Not enough memory to allocate for level 0");
+        }
 
         cur_element_count = 0;
 
@@ -137,10 +137,10 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
         maxlevel_ = -1;
 
         linkLists_ = (char **) malloc(sizeof(void *) * max_elements_);
-
-        // TODO(bautin): handle
-        // if (linkLists_ == nullptr)
-        //     return Status("Not enough memory: HierarchicalNSW failed to allocate linklists");
+        if (linkLists_ == nullptr) {
+            HNSWLIB_THROW_RUNTIME_ERROR(
+                "Not enough memory: HierarchicalNSW failed to allocate linklists");
+        }
 
         size_links_per_element_ = maxM_ * sizeof(tableint) + sizeof(linklistsizeint);
         mult_ = 1 / log(1.0 * M_);

tests/cpp/epsilon_search_test.cpp

@@ -49,7 +49,7 @@ int main() {
             query_data[j] = distrib_real(rng);
         }
         hnswlib::EpsilonSearchStopCondition<dist_t> stop_condition(epsilon2, min_num_candidates, max_num_candidates);
-        auto result_hnsw =
+        std::vector<std::pair<float, hnswlib::labeltype>> result_hnsw =
             alg_hnsw->searchStopConditionClosest(query_data, stop_condition);
 
         // check that returned results are in epsilon region
@@ -61,7 +61,8 @@ int main() {
             hnsw_labels.insert(label);
             assert(dist >=0 && dist <= epsilon2);
         }
-        auto result_brute = alg_brute->searchKnn(query_data, max_elements);
+        std::priority_queue<std::pair<float, hnswlib::labeltype>> result_brute =
+            result_brute = alg_brute->searchKnn(query_data, max_elements);
 
         // check recall
         std::unordered_set<hnswlib::labeltype> gt_labels;