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
6 changes: 2 additions & 4 deletions diskann-disk/src/search/provider/disk_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,15 @@ use diskann::{
Accessor, BuildQueryComputer, DataProvider, DefaultContext, DelegateNeighbor, HasId,
NeighborAccessor, NoopGuard,
},
utils::{
object_pool::{ObjectPool, PoolOption, TryAsPooled},
IntoUsize, VectorRepr,
},
utils::{IntoUsize, VectorRepr},
ANNError, ANNResult,
};
use diskann_providers::storage::StorageReadProvider;
use diskann_providers::{
model::{compute_pq_distance, compute_pq_distance_for_pq_coordinates},
storage::{get_compressed_pq_file, get_disk_index_file, get_pq_pivot_file, LoadWith},
};
use diskann_utils::object_pool::{ObjectPool, PoolOption, TryAsPooled};

use crate::search::pq::{quantizer_preprocess, PQData, PQScratch};
use diskann_vector::{distance::Metric, DistanceFunction, PreprocessedDistanceFunction};
Expand Down
6 changes: 2 additions & 4 deletions diskann-garnet/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ use diskann::{
Accessor, BuildDistanceComputer, BuildQueryComputer, DataProvider, DelegateNeighbor,
Delete, ElementStatus, HasId, NeighborAccessor, NeighborAccessorMut, NoopGuard, SetElement,
},
utils::{
VectorRepr,
object_pool::{AsPooled, ObjectPool, PooledRef, Undef},
},
utils::VectorRepr,
};
use diskann_providers::model::graph::provider::async_::common::FullPrecision;
use diskann_utils::Reborrow;
use diskann_utils::object_pool::{AsPooled, ObjectPool, PooledRef, Undef};
use diskann_vector::{PreprocessedDistanceFunction, contains::ContainsSimd, distance::Metric};
use std::{
future, mem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ use std::sync::Arc;

use bf_tree::{BfTree, Config};
use bytemuck::bytes_of;
use diskann::{
ANNError, ANNErrorKind, ANNResult,
error::IntoANNResult,
utils::{VectorRepr, object_pool::ObjectPool},
};
use diskann::{ANNError, ANNErrorKind, ANNResult, error::IntoANNResult, utils::VectorRepr};
use diskann_quantization::CompressInto;
use diskann_utils::object_pool::ObjectPool;
use diskann_vector::distance::Metric;
use thiserror::Error;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
use std::sync::{Arc, Mutex};

use crate::storage::{StorageReadProvider, StorageWriteProvider};
use diskann::{
ANNError, ANNResult,
error::IntoANNResult,
utils::{VectorRepr, object_pool::ObjectPool},
};
use diskann::{ANNError, ANNResult, error::IntoANNResult, utils::VectorRepr};
use diskann_quantization::CompressInto;
use diskann_utils::object_pool::ObjectPool;
use diskann_vector::distance::Metric;

use super::common::{AlignedMemoryVectorStore, TestCallCount};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ use crate::storage::{StorageReadProvider, StorageWriteProvider};
use arc_swap::{ArcSwap, Guard};
#[cfg(test)]
use diskann::utils::VectorRepr;
use diskann::{ANNError, ANNResult, utils::object_pool::ObjectPool};
use diskann::{ANNError, ANNResult};
#[cfg(test)]
use diskann_quantization::CompressInto;
use diskann_utils::object_pool::ObjectPool;
use diskann_vector::{DistanceFunction, PreprocessedDistanceFunction, distance::Metric};

use super::{VectorGuard, common::TestCallCount};
Expand Down
2 changes: 1 addition & 1 deletion diskann-providers/src/model/pq/distance/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT license.
*/

use diskann::utils::object_pool::{self, ObjectPool};
use diskann_utils::object_pool::{self, ObjectPool};

use crate::model::pq::fixed_chunk_pq_table::FixedChunkPQTable;

Expand Down
3 changes: 2 additions & 1 deletion diskann-providers/src/model/pq/distance/dynamic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

use std::{ops::Deref, sync::Arc};

use diskann::{ANNResult, utils::object_pool::ObjectPool};
use diskann::ANNResult;
use diskann_utils::object_pool::ObjectPool;
use diskann_vector::{DistanceFunction, PreprocessedDistanceFunction, distance::Metric};

// Concrete implementations
Expand Down
6 changes: 2 additions & 4 deletions diskann-providers/src/model/pq/distance/innerproduct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

use std::{ops::Deref, sync::Arc};

use diskann::{
ANNResult,
utils::object_pool::{self, ObjectPool, PoolOption},
};
use diskann::ANNResult;
use diskann_utils::object_pool::{self, ObjectPool, PoolOption};
use diskann_vector::PreprocessedDistanceFunction;

use super::common::get_lookup_table_size;
Expand Down
6 changes: 2 additions & 4 deletions diskann-providers/src/model/pq/distance/l2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

use std::{ops::Deref, sync::Arc};

use diskann::{
ANNResult,
utils::object_pool::{self, ObjectPool, PoolOption},
};
use diskann::ANNResult;
use diskann_utils::object_pool::{self, ObjectPool, PoolOption};
use diskann_vector::PreprocessedDistanceFunction;

use super::common::get_lookup_table_size;
Expand Down
1 change: 1 addition & 0 deletions diskann-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pub use lifetime::WithLifetime;
pub mod future;

pub mod io;
pub mod object_pool;
pub mod sampling;

// Views
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion diskann/src/graph/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ use crate::{
utils::{
IntoUsize, TryIntoVectorId, VectorId,
async_tools::{self, DynamicBalancer},
object_pool::{ObjectPool, PooledRef},
},
};
use diskann_utils::object_pool::{ObjectPool, PooledRef};

#[derive(Debug)]
pub struct DiskANNIndex<DP: DataProvider> {
Expand Down
3 changes: 2 additions & 1 deletion diskann/src/graph/search/scratch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ use std::collections::VecDeque;

use crate::{
neighbor::{Neighbor, NeighborPriorityQueue},
utils::{VectorId, object_pool::AsPooled},
utils::VectorId,
};
use diskann_utils::object_pool::AsPooled;
use hashbrown::HashSet;

/// In-mem index related limits
Expand Down
2 changes: 0 additions & 2 deletions diskann/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* Licensed under the MIT license.
*/

pub mod object_pool;

pub mod async_tools;
Comment thread
arkrishn94 marked this conversation as resolved.

#[allow(clippy::module_inception)]
Expand Down
Loading