Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bindings/c/include/svs/c/svs_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ SVS_API void svs_index_builder_free(svs_index_builder_h builder);
/// @param out_err An optional error handle to capture errors
/// @return true on success, false on failure
/// @remarks Indexes keep the logger they were created with; the handle may be freed after
/// this call. Stream loads ignore it and use the global default logger.
/// this call.
SVS_API bool svs_index_builder_set_logger(
svs_index_builder_h builder, svs_logger_h logger, svs_error_h out_err /*=NULL*/
);
Expand Down
11 changes: 7 additions & 4 deletions bindings/c/src/dispatcher_dynamic_vamana.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ svs::DynamicVamana load_stream_dynamic_vamana_index(
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder,
const svs::data::BlockingParameters& block_params,
svs::logging::logger_ptr SVS_UNUSED(logger)
svs::logging::logger_ptr logger
) {
using allocator_type = typename DataLoader::allocator_type;
using value_type = typename allocator_type::value_type;
Expand All @@ -131,7 +131,9 @@ svs::DynamicVamana load_stream_dynamic_vamana_index(
svs::graphs::SimpleGraph<uint32_t, decltype(graph_allocator)>>(graph_allocator),
svs::make_stream_loader<data_type>(allocator),
distance,
std::move(pool)
std::move(pool),
/*debug_load_from_static=*/false,
Comment thread
ahuber21 marked this conversation as resolved.
std::move(logger)
);
}

Expand Down Expand Up @@ -385,7 +387,8 @@ svs::DynamicVamana dispatch_dynamic_vamana_index_load_stream(
svs::DistanceType distance_type,
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder,
const svs::data::BlockingParameters& block_params
const svs::data::BlockingParameters& block_params,
svs::logging::logger_ptr logger
) {
return build_dynamic_vamana_index_dispatcher().invoke(
build_params,
Expand All @@ -395,7 +398,7 @@ svs::DynamicVamana dispatch_dynamic_vamana_index_load_stream(
std::move(pool),
allocator_builder,
block_params,
nullptr
std::move(logger)
);
}

Expand Down
3 changes: 2 additions & 1 deletion bindings/c/src/dispatcher_dynamic_vamana.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ svs::DynamicVamana dispatch_dynamic_vamana_index_load_stream(
svs::DistanceType distance_type,
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder,
const svs::data::BlockingParameters& block_params
const svs::data::BlockingParameters& block_params,
svs::logging::logger_ptr logger
);

svs::DynamicVamana dispatch_dynamic_vamana_index_copy(
Expand Down
10 changes: 6 additions & 4 deletions bindings/c/src/dispatcher_vamana.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ svs::Vamana load_stream_vamana_index(
Distance distance,
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder,
svs::logging::logger_ptr SVS_UNUSED(logger)
svs::logging::logger_ptr logger
) {
using value_type = typename DataLoader::allocator_type::value_type;
using data_type = typename DataLoader::data_type;
Expand All @@ -108,7 +108,8 @@ svs::Vamana load_stream_vamana_index(
svs::graphs::SimpleGraph<uint32_t, decltype(graph_allocator)>>(graph_allocator),
svs::make_stream_loader<data_type>(data_allocator),
distance,
std::move(pool)
std::move(pool),
std::move(logger)
);
}

Expand Down Expand Up @@ -341,7 +342,8 @@ svs::Vamana dispatch_vamana_index_load_stream(
const Storage* storage,
svs::DistanceType distance_type,
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder
const AllocatorBuilder& allocator_builder,
svs::logging::logger_ptr logger
) {
return build_vamana_index_dispatcher().invoke(
build_params,
Expand All @@ -350,7 +352,7 @@ svs::Vamana dispatch_vamana_index_load_stream(
distance_type,
std::move(pool),
allocator_builder,
nullptr
std::move(logger)
);
}

Expand Down
3 changes: 2 additions & 1 deletion bindings/c/src/dispatcher_vamana.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ svs::Vamana dispatch_vamana_index_load_stream(
const Storage* storage,
svs::DistanceType distance_type,
svs::threads::ThreadPoolHandle pool,
const AllocatorBuilder& allocator_builder
const AllocatorBuilder& allocator_builder,
svs::logging::logger_ptr logger
);

svs::Vamana dispatch_vamana_index_copy(
Expand Down
6 changes: 4 additions & 2 deletions bindings/c/src/index_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ std::shared_ptr<Index> IndexBuilder::load_stream(std::unique_ptr<std::istream>&&
storage.get(),
to_distance_type(distance_metric),
pool_builder.build(),
allocator_builder
allocator_builder,
get_logger()
)
);

Expand Down Expand Up @@ -305,7 +306,8 @@ std::shared_ptr<DynamicIndex> IndexBuilder::load_stream_dynamic(
to_distance_type(distance_metric),
pool_builder.build(),
allocator_builder,
block_params
block_params,
get_logger()
),
sync_kind
);
Expand Down
Loading