fix the memory leak in QBG search

yahoojapan · Feb 27, 2025 · aa3bca0 · aa3bca0
1 parent c7b9bb7
commit aa3bca0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/NGT/HashBasedBooleanSet.h b/lib/NGT/HashBasedBooleanSet.h
@@ -57,8 +57,9 @@ template <typename TYPE> class HashBasedBooleanSet {
     memset(_table, 0, tableSize * sizeof(TYPE));
   }
 
-  ~HashBasedBooleanSet() {
+  virtual ~HashBasedBooleanSet() {
     delete[] _table;
+    _table = 0;
     _stlHash.clear();
   }
 

diff --git a/lib/NGT/NGTQ/QuantizedBlobGraph.h b/lib/NGT/NGTQ/QuantizedBlobGraph.h
@@ -1375,11 +1375,9 @@ class Index : public NGTQ::Index {
     //NGTQ::BooleanSet *checkedIDs = nullptr;
     std::unique_ptr<NGTQ::BooleanSet> checkedIDs = nullptr;
     if (quantizer.objectList.size() < 5000000) {
-      //checkedIDs = new NGTQ::BooleanVector(quantizer.objectList.size());
       std::unique_ptr<NGTQ::BooleanVector> tmp(new NGTQ::BooleanVector(quantizer.objectList.size()));
       checkedIDs = std::move(tmp);
     } else {
-      //checkedIDs = new NGTQ::BooleanHash(quantizer.objectList.size());
       std::unique_ptr<NGTQ::BooleanHash> tmp(new NGTQ::BooleanHash(quantizer.objectList.size()));
       checkedIDs = std::move(tmp);
     }

diff --git a/lib/NGT/NGTQ/Quantizer.h b/lib/NGT/NGTQ/Quantizer.h
@@ -80,6 +80,7 @@ namespace NGTQ {
 
 class BooleanSet {
  public:
+  virtual ~BooleanSet() {};
   virtual bool get(size_t idx)        = 0;
   virtual void set(size_t idx)        = 0;
   virtual bool operator[](size_t idx) = 0;

diff --git a/python/setup.py b/python/setup.py
@@ -115,7 +115,8 @@
                              pybind11.get_include(True),
                              pybind11.get_include(False)],
             'extra_compile_args': ['-std=c++11', '-Ofast',
-                                   '-march=x86_64' if platform.processor() == 'x86-64' else '',
+                                   '-march=x86-64' if platform.processor() == 'x86-64' or
+                                   platform.processor() == 'x86_64' else '',
                                    '-DNDEBUG'],
             'sources': ['src/ngtpy.cpp']
         }
@@ -125,7 +126,8 @@
                              pybind11.get_include(True),
                              pybind11.get_include(False)],
             'extra_compile_args': ['-std=c++11', '-Ofast',
-                                   '-march=haswell' if platform.processor() == 'x86-64' else '',
+                                   '-march=haswell' if platform.processor() == 'x86-64' or
+                                   platform.processor() == 'x86_64' else '',
                                    '-DNDEBUG'],
             'sources': ['src/ngtpy_avx2.cpp']
         }