Use temporary git repo for hannoy and arroy in nested-rtxns pre-version

This commit is contained in:
Clément Renault
2025-10-01 15:09:07 +02:00
parent 229a12c8e6
commit 7a98b80687
3 changed files with 67 additions and 30 deletions

86
Cargo.lock generated
View File

@@ -453,14 +453,13 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "arroy"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8578a72223dfa13dfd9fc144d15260d134361789ebdea9b16e85a511edc73c7d"
version = "0.6.4-nested-rtxns"
source = "git+https://github.com/meilisearch/arroy?branch=use-heed-nested-rtxns#61c8f4f0addeff968e80438018d0aee2c1eb8d67"
dependencies = [
"bytemuck",
"byteorder",
"enum-iterator",
"heed",
"heed 0.22.1-nested-rtxns (registry+https://github.com/rust-lang/crates.io-index)",
"memmap2",
"nohash",
"ordered-float 4.6.0",
@@ -1075,16 +1074,14 @@ dependencies = [
[[package]]
name = "cellulite"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71a41aa2cd021bc3f23d97cc1e645848ca8c279fc757d1570ba7fe7ddc021290"
version = "0.3.1-nested-rtxns"
dependencies = [
"crossbeam",
"geo",
"geo-types",
"geojson",
"h3o",
"heed",
"heed 0.22.1-nested-rtxns",
"intmap",
"ordered-float 5.0.0",
"rayon",
@@ -2758,14 +2755,13 @@ dependencies = [
[[package]]
name = "hannoy"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dba13a271c49a119a97862ebf0a74131d879832868400d9fcd937b790058fdd"
version = "0.0.9-nested-rtxns"
source = "git+https://github.com/nnethercott/hannoy?branch=use-heed-nested-rtxns#d4ca5454eff6539e9fc2119f07113abebbda0a39"
dependencies = [
"bytemuck",
"byteorder",
"hashbrown 0.15.5",
"heed",
"heed 0.22.1-nested-rtxns (registry+https://github.com/rust-lang/crates.io-index)",
"madvise",
"min-max-heap",
"page_size",
@@ -2838,15 +2834,14 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "heed"
version = "0.22.0"
source = "git+https://github.com/meilisearch/heed?branch=allow-nested-rtxn-from-wtxn#05d9f224e274eaffcb023b9008028325769248cf"
version = "0.22.1-nested-rtxns"
dependencies = [
"bitflags 2.9.4",
"byteorder",
"heed-traits",
"heed-types",
"heed-traits 0.20.0",
"heed-types 0.21.0",
"libc",
"lmdb-master-sys",
"lmdb-master-sys 0.2.6-nested-rtxns",
"once_cell",
"page_size",
"serde",
@@ -2854,19 +2849,54 @@ dependencies = [
"url",
]
[[package]]
name = "heed"
version = "0.22.1-nested-rtxns"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ff115ba5712b1f1fc7617b195f5c2f139e29c397ff79da040cd19db75ccc240"
dependencies = [
"bitflags 2.9.4",
"byteorder",
"heed-traits 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heed-types 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc",
"lmdb-master-sys 0.2.6-nested-rtxns (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell",
"page_size",
"synchronoise",
"url",
]
[[package]]
name = "heed-traits"
version = "0.20.0"
source = "git+https://github.com/meilisearch/heed?branch=allow-nested-rtxn-from-wtxn#05d9f224e274eaffcb023b9008028325769248cf"
[[package]]
name = "heed-traits"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
[[package]]
name = "heed-types"
version = "0.21.0"
source = "git+https://github.com/meilisearch/heed?branch=allow-nested-rtxn-from-wtxn#05d9f224e274eaffcb023b9008028325769248cf"
dependencies = [
"bincode 1.3.3",
"byteorder",
"heed-traits",
"heed-traits 0.20.0",
"serde",
"serde_json",
]
[[package]]
name = "heed-types"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
dependencies = [
"bincode 1.3.3",
"byteorder",
"heed-traits 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde",
"serde_json",
]
@@ -3886,8 +3916,18 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
[[package]]
name = "lmdb-master-sys"
version = "0.2.5"
source = "git+https://github.com/meilisearch/heed?branch=allow-nested-rtxn-from-wtxn#05d9f224e274eaffcb023b9008028325769248cf"
version = "0.2.6-nested-rtxns"
dependencies = [
"cc",
"doxygen-rs",
"libc",
]
[[package]]
name = "lmdb-master-sys"
version = "0.2.6-nested-rtxns"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4ff85130e3c994b36877045fbbb138d521dea7197bfc19dc3d5d95101a8e20a"
dependencies = [
"cc",
"doxygen-rs",
@@ -4225,7 +4265,7 @@ dependencies = [
"grenad",
"hannoy",
"hashbrown 0.15.5",
"heed",
"heed 0.22.1-nested-rtxns (registry+https://github.com/rust-lang/crates.io-index)",
"hf-hub",
"indexmap",
"insta",

View File

@@ -50,6 +50,3 @@ opt-level = 3
opt-level = 3
[profile.dev.package.roaring]
opt-level = 3
[patch.crates-io]
heed = { git = "https://github.com/meilisearch/heed", branch = "allow-nested-rtxn-from-wtxn" }

View File

@@ -19,7 +19,7 @@ bstr = "1.12.0"
bytemuck = { version = "1.23.1", features = ["extern_crate_alloc"] }
byteorder = "1.5.0"
charabia = { version = "0.9.7", default-features = false }
cellulite = "0.3.0"
cellulite = { version = "0.3.1-nested-rtxns", path = "../../../cellulite" }
concat-arrays = "0.1.2"
convert_case = "0.8.0"
crossbeam-channel = "0.5.15"
@@ -34,7 +34,7 @@ grenad = { version = "0.5.0", default-features = false, features = [
"rayon",
"tempfile",
] }
heed = { version = "0.22.0", default-features = false, features = [
heed = { version = "0.22.1-nested-rtxns", default-features = false, features = [
"serde-json",
"serde-bincode",
] }
@@ -89,8 +89,8 @@ rhai = { version = "1.22.2", features = [
"no_time",
"sync",
] }
arroy = "0.6.3"
hannoy = { version = "0.0.8", features = ["arroy"] }
arroy = { version = "0.6.4-nested-rtxns", git = "https://github.com/meilisearch/arroy", "branch" = "use-heed-nested-rtxns" }
hannoy = { version = "0.0.9-nested-rtxns", git = "https://github.com/nnethercott/hannoy", "branch" = "use-heed-nested-rtxns", features = ["arroy"] }
rand = "0.8.5"
tracing = "0.1.41"
ureq = { version = "2.12.1", features = ["json"] }