Skip to content

enhance: rm useless hnsw module [WIP] #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iaojnh wants to merge 12 commits into
base: main
Choose a base branch
from
Open

enhance: rm useless hnsw module [WIP] #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7f44236
rm hnsw_builder
iaojnh Mar 4, 2026
1b03901
rm hnsw searcher
iaojnh Mar 4, 2026
956eb0a
fix ut
iaojnh Mar 4, 2026
52a2bab
Merge branch 'main' into enhance/hnsw_entity
iaojnh Mar 10, 2026
6a104ba
add HnswStreamerEntityNew
iaojnh Mar 10, 2026
7a62567
replace hnsw_entity
iaojnh Mar 10, 2026
8eccbac
rm old entity
iaojnh Mar 11, 2026
b67277f
fix
iaojnh Mar 11, 2026
6b4eea8
upd entity
iaojnh Mar 11, 2026
5aa9ed2
upd
iaojnh Mar 12, 2026
4e87aa8
upd get neighbor
iaojnh Mar 12, 2026
ce6a033
upd
iaojnh Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/core/algorithm/hnsw/hnsw_algorithm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
namespace zvec {
namespace core {

HnswAlgorithm::HnswAlgorithm(HnswEntity &entity)
HnswAlgorithm::HnswAlgorithm(HnswStreamerEntityNew &entity)
: entity_(entity),
mt_(std::chrono::system_clock::now().time_since_epoch().count()),
lock_pool_(kLockCnt) {}
Expand Down Expand Up @@ -113,7 +113,7 @@ void HnswAlgorithm::select_entry_point(level_t level, node_id_t *entry_point,
auto &entity = ctx->get_entity();
HnswDistCalculator &dc = ctx->dist_calculator();
while (true) {
const Neighbors neighbors = entity.get_neighbors(level, *entry_point);
const Neighbors neighbors = entity.get_neighbors_new(level, *entry_point);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_neighbors())++;
}
Expand All @@ -123,7 +123,7 @@ void HnswAlgorithm::select_entry_point(level_t level, node_id_t *entry_point,
}

std::vector<IndexStorage::MemoryBlock> neighbor_vec_blocks;
int ret = entity.get_vector(&neighbors[0], size, neighbor_vec_blocks);
int ret = entity.get_vector_new(&neighbors[0], size, neighbor_vec_blocks);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_vector())++;
}
Expand Down Expand Up @@ -208,7 +208,7 @@ void HnswAlgorithm::search_neighbors(level_t level, node_id_t *entry_point,
}

candidates.pop();
const Neighbors neighbors = entity.get_neighbors(level, main_node);
const Neighbors neighbors = entity.get_neighbors_new(level, main_node);
ailego_prefetch(neighbors.data);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_neighbors())++;
Expand All @@ -232,7 +232,8 @@ void HnswAlgorithm::search_neighbors(level_t level, node_id_t *entry_point,
}

std::vector<IndexStorage::MemoryBlock> neighbor_vec_blocks;
int ret = entity.get_vector(neighbor_ids.data(), size, neighbor_vec_blocks);
int ret =
entity.get_vector_new(neighbor_ids.data(), size, neighbor_vec_blocks);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_vector())++;
}
Expand Down Expand Up @@ -332,7 +333,7 @@ void HnswAlgorithm::expand_neighbors_by_group(TopkHeap &topk,
node_id_t main_node = top->first;

candidates.pop();
const Neighbors neighbors = entity.get_neighbors(0, main_node);
const Neighbors neighbors = entity.get_neighbors_new(0, main_node);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_neighbors())++;
}
Expand All @@ -356,7 +357,7 @@ void HnswAlgorithm::expand_neighbors_by_group(TopkHeap &topk,

std::vector<IndexStorage::MemoryBlock> neighbor_vec_blocks;
int ret =
entity.get_vector(neighbor_ids.data(), size, neighbor_vec_blocks);
entity.get_vector_new(neighbor_ids.data(), size, neighbor_vec_blocks);
if (ailego_unlikely(ctx->debugging())) {
(*ctx->mutable_stats_get_vector())++;
}
Expand Down Expand Up @@ -463,7 +464,7 @@ void HnswAlgorithm::reverse_update_neighbors(HnswDistCalculator &dc,

uint32_t lock_idx = id & kLockMask;
lock_pool_[lock_idx].lock();
const Neighbors neighbors = entity_.get_neighbors(level, id);
const Neighbors neighbors = entity_.get_neighbors_new(level, id);
size_t size = neighbors.size();
ailego_assert_with(size <= max_neighbor_cnt, "invalid neighbor size");
if (size < max_neighbor_cnt) {
Expand Down
6 changes: 3 additions & 3 deletions src/core/algorithm/hnsw/hnsw_algorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <ailego/parallel/lock.h>
#include "hnsw_context.h"
#include "hnsw_dist_calculator.h"
#include "hnsw_entity.h"
#include "hnsw_streamer_entity_new.h"

namespace zvec {
namespace core {
Expand All @@ -29,7 +29,7 @@ class HnswAlgorithm {

public:
//! Constructor
explicit HnswAlgorithm(HnswEntity &entity);
explicit HnswAlgorithm(HnswStreamerEntityNew &entity);

//! Destructor
~HnswAlgorithm() = default;
Expand Down Expand Up @@ -116,7 +116,7 @@ class HnswAlgorithm {
static constexpr uint32_t kLockCnt{1U << 8};
static constexpr uint32_t kLockMask{kLockCnt - 1U};

HnswEntity &entity_;
HnswStreamerEntityNew &entity_;
mutable std::mt19937 mt_{};
std::vector<double> level_probas_{};

Expand Down
Loading
Loading