Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[rust][photos] Reduce bulk vector search memory

laurenspriemd00f21311fa8
diff --git a/rust/crates/photos/src/ml/vector_db.rs b/rust/crates/photos/src/ml/vector_db.rs
index 6430b21530..87bbd034f7 100644
--- a/rust/crates/photos/src/ml/vector_db.rs
+++ b/rust/crates/photos/src/ml/vector_db.rs
@@ -354,37 +354,23 @@ impl VectorDB {
exact: bool,
) -> Result<BulkSearchByKeyMatch, String> {
let dimensions = self.index.dimensions();
- let mut embedding_data = vec![0.0f32; potential_keys.len() * dimensions];
- let mut contained_keys = Vec::with_capacity(potential_keys.len());
- let mut actual_query_count = 0;
+ let result_capacity = potential_keys.len().min(self.index.size());
+ let mut contained_keys = Vec::with_capacity(result_capacity);
+ let mut closeby_keys = Vec::with_capacity(result_capacity);
+ let mut distances = Vec::with_capacity(result_capacity);
+ let mut query = vec![0.0f32; dimensions];
for key in potential_keys {
if self.index.contains(*key) {
- let start_idx = actual_query_count * dimensions;
- let end_idx = start_idx + dimensions;
- let embedding_slice = &mut embedding_data[start_idx..end_idx];
-
self.index
- .get(*key, embedding_slice)
+ .get(*key, &mut query)
.map_err(|e| format!("Failed to get vector for key {key}: {e}"))?;
+ let (keys_result, distances_result) = self.search_vectors(&query, count, exact)?;
contained_keys.push(*key);
- actual_query_count += 1;
+ closeby_keys.push(keys_result);
+ distances.push(distances_result);
}
}
- embedding_data.truncate(actual_query_count * dimensions);
-
- let max_result_size = std::cmp::min(self.index.size(), count);
- let mut closeby_keys = vec![Vec::with_capacity(max_result_size); actual_query_count];
- let mut distances = vec![Vec::with_capacity(max_result_size); actual_query_count];
-
- for i in 0..actual_query_count {
- let start_idx = i * dimensions;
- let end_idx = start_idx + dimensions;
- let query_slice = &embedding_data[start_idx..end_idx];
- let (keys_result, distances_result) = self.search_vectors(query_slice, count, exact)?;
- closeby_keys[i] = keys_result;
- distances[i] = distances_result;
- }
Ok((contained_keys, closeby_keys, distances))
}
@@ -473,3 +459,29 @@ impl VectorDB {
)
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::VectorDB;
+
+ #[test]
+ fn bulk_search_keys_preserves_contained_key_order_and_result_alignment() {
+ let temp_dir = tempfile::tempdir().unwrap();
+ let index_path = temp_dir.path().join("vectors.usearch");
+ let mut db = VectorDB::new(index_path.to_str().unwrap(), 3).unwrap();
+ db.bulk_add_vectors(vec![2, 4], &[vec![1.0, 0.0, 0.0], vec![0.0, 1.0, 0.0]])
+ .unwrap();
+
+ let potential_keys = vec![9, 4, 2, 8];
+ let (contained_keys, matched_keys, distances) =
+ db.bulk_search_keys(&potential_keys, 2, true).unwrap();
+
+ assert_eq!(contained_keys, vec![4, 2]);
+ assert_eq!(matched_keys.len(), contained_keys.len());
+ assert_eq!(distances.len(), contained_keys.len());
+ assert_eq!(matched_keys[0].first(), Some(&4));
+ assert_eq!(matched_keys[1].first(), Some(&2));
+ assert_eq!(distances[0].first(), Some(&0.0));
+ assert_eq!(distances[1].first(), Some(&0.0));
+ }
+}