fix memory leak for hnsw #137

inabao · 2024-11-14T03:59:41Z

change the memory allocation of VisitListPool from new to allocate.

fixed: #70

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone · 2024-11-19T16:34:24Z

src/algorithm/hnswlib/hnswalg.cpp

@@ -73,6 +71,11 @@ HierarchicalNSW::HierarchicalNSW(SpaceInterface* s,

 void
 HierarchicalNSW::reset() {
+    if (visited_list_pool_) {
+        visited_list_pool_->~VisitedListPool();


here we can overloading new/delete operator

jiaweizone · 2024-11-19T16:35:02Z

src/algorithm/hnswlib/hnswalg.cpp

@@ -89,6 +92,12 @@ bool
 HierarchicalNSW::init_memory_space() {
    // release the memory allocated by the init_memory_space function that was called earlier
    reset();
+    auto visited_list_mem = allocator_->Allocate(sizeof(VisitedListPool));


Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone · 2024-11-20T10:03:48Z

src/algorithm/hnswlib/hnswalg.cpp

@@ -73,6 +71,10 @@ HierarchicalNSW::HierarchicalNSW(SpaceInterface* s,

 void
 HierarchicalNSW::reset() {
+    if (visited_list_pool_) {
+        VisitedListPool::operator delete(visited_list_pool_, allocator_);


delete visitored_list_pool_

Because an allocator is used, the default new and delete cannot be used.

Ok, maybe we can add New and Delete function to Allocator, like this:

class Allocator { public: void* Allocate(size_t size) { ... } void Deallocate(void* p) { ... } template<typename T, typename ...Args> T* New(Args&&... args) { void* p = Allocate(sizeof(T)); return (T*) ::new (p) T(std::forward<Args>(args)...); } template<typename T> void Delete(T* p) { p->~T(); Deallocate(static_cast<void*>(p)); } } // .... void HierarchicalNSW::init_memory_space() { // ... visited_list_pool_ = allocator_->New<VisitedListPool>(max_elements_, allocator_); } void HierarchicalNSW::reset() { if (visited_list_pool_) { allocator_->Delete(visited_list_pool_); } // ... }

OK, I have modified it.

src/algorithm/hnswlib/visited_list_pool.h

jiaweizone · 2024-11-20T10:06:00Z

src/algorithm/hnswlib/visited_list_pool.h

+    }
+
+    void
+    operator delete(void* p, vsag::Allocator* alloc) noexcept {


void operator delete(void* p) noexcept { alloc->Deallocate(p); }

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone · 2024-11-21T16:27:47Z

src/algorithm/hnswlib/visited_list_pool.h

@@ -77,11 +79,20 @@ using VisitedListPtr = std::shared_ptr<VisitedList>;

 class VisitedListPool {
 public:
-    VisitedListPool(int initmaxpools, uint64_t numelements1, vsag::Allocator* allocator)
-        : allocator_(allocator) {
+    VisitedListPool(uint64_t numelements1, vsag::Allocator* allocator)


numelements1 typo ?

I have renamed it to max_element_count

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone · 2024-11-22T03:37:52Z

src/algorithm/hnswlib/hnswalg_static.h

@@ -161,7 +161,7 @@ class StaticHierarchicalNSW : public AlgorithmInterface<float> {

        cur_element_count_ = 0;

-        visited_list_pool_ = new VisitedListPool(1, max_elements, allocator_);
+        visited_list_pool_ = new (allocator_) VisitedListPool(max_elements, allocator_);


visited_list_pool_ = allocator_->New(max_elements, allocator_);

jiaweizone · 2024-11-22T03:38:46Z

src/algorithm/hnswlib/hnswalg_static.h

@@ -187,7 +187,7 @@ class StaticHierarchicalNSW : public AlgorithmInterface<float> {
        }
        allocator_->Deallocate(element_levels_);
        allocator_->Deallocate(linkLists_);
-        delete visited_list_pool_;
+        VisitedListPool::operator delete(visited_list_pool_, allocator_);


miss change ?

jiaweizone · 2024-11-22T03:39:01Z

src/algorithm/hnswlib/hnswalg_static.h

@@ -935,8 +935,8 @@ class StaticHierarchicalNSW : public AlgorithmInterface<float> {
            throw std::runtime_error(
                "Cannot Resize, max element is less than the current number of elements");

-        delete visited_list_pool_;
-        visited_list_pool_ = new VisitedListPool(1, new_max_elements, allocator_);
+        VisitedListPool::operator delete(visited_list_pool_, allocator_);


jiaweizone · 2024-11-22T03:39:08Z

src/algorithm/hnswlib/hnswalg_static.h

@@ -1527,8 +1527,7 @@ class StaticHierarchicalNSW : public AlgorithmInterface<float> {
        std::vector<std::mutex>(max_elements).swap(link_list_locks_);
        std::vector<std::mutex>(MAX_LABEL_OPERATION_LOCKS).swap(label_op_locks_);

-        delete visited_list_pool_;
-        visited_list_pool_ = new VisitedListPool(1, max_elements, allocator_);
+        visited_list_pool_ = new (allocator_) VisitedListPool(max_elements, allocator_);


Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

src/algorithm/hnswlib/hnswalg.cpp

jiaweizone · 2024-11-22T07:39:36Z

src/algorithm/hnswlib/visited_list_pool.h

    }

 private:
-    std::deque<VisitedListPtr> pool;
+    vsag::Vector<VisitedListPtr> pool;


pool -> pool_

src/index/hgraph_index.cpp

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone

LGTM

wxyucs

lgtm

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jinjiabao.jjb added 2 commits November 14, 2024 11:54

fix memory leak for hnsw

c25d625

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

6fc6aca

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

inabao requested a review from jiaweizone as a code owner November 14, 2024 03:59

pull-request-size bot added the size/S label Nov 14, 2024

Merge remote-tracking branch 'origin' into ob-memory-leak-analyze

a16dfc5

inabao requested review from wxyucs and LHT129 November 16, 2024 08:06

inabao self-assigned this Nov 16, 2024

inabao added the kind/bug Something isn't working label Nov 16, 2024

Merge remote-tracking branch 'origin' into ob-memory-leak-analyze

8214884

jiaweizone reviewed Nov 19, 2024

View reviewed changes

modify

40d6236

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

pull-request-size bot added size/M and removed size/S labels Nov 20, 2024

jinjiabao.jjb added 3 commits November 20, 2024 17:10

format code

c6dcfad

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

9ccfbd1

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

f4a2aea

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone reviewed Nov 20, 2024

View reviewed changes

jinjiabao.jjb added 3 commits November 20, 2024 23:08

modify

1ec8379

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

60dde98

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

d3e1e1f

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone reviewed Nov 21, 2024

View reviewed changes

jinjiabao.jjb added 2 commits November 22, 2024 11:20

modify

48e5c62

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

modify

be7399e

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone reviewed Nov 22, 2024

View reviewed changes

modify

28642b7

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone reviewed Nov 22, 2024

View reviewed changes

modify

cfc6418

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

jiaweizone approved these changes Nov 22, 2024

View reviewed changes

wxyucs approved these changes Nov 24, 2024

View reviewed changes

inabao merged commit 7217fa3 into main Nov 24, 2024
2 checks passed

inabao deleted the ob-memory-leak-analyze branch November 24, 2024 14:48

inabao added a commit that referenced this pull request Nov 25, 2024

fix memory leak for hnsw (#137)

e900f25

Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix memory leak for hnsw #137

fix memory leak for hnsw #137

inabao commented Nov 14, 2024 •

edited

Loading

jiaweizone Nov 19, 2024

inabao Nov 20, 2024

jiaweizone Nov 19, 2024

inabao Nov 20, 2024

jiaweizone Nov 20, 2024

inabao Nov 21, 2024

jiaweizone Nov 21, 2024 •

edited

Loading

inabao Nov 22, 2024

jiaweizone Nov 20, 2024

inabao Nov 21, 2024

jiaweizone Nov 21, 2024

inabao Nov 22, 2024

jiaweizone Nov 22, 2024

jiaweizone Nov 22, 2024

jiaweizone Nov 22, 2024

jiaweizone Nov 22, 2024

jiaweizone Nov 22, 2024

inabao Nov 22, 2024

jiaweizone left a comment

wxyucs left a comment

fix memory leak for hnsw #137

fix memory leak for hnsw #137

Conversation

inabao commented Nov 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiaweizone Nov 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiaweizone left a comment

Choose a reason for hiding this comment

wxyucs left a comment

Choose a reason for hiding this comment

inabao commented Nov 14, 2024 •

edited

Loading

jiaweizone Nov 21, 2024 •

edited

Loading