diff --git a/DevDocMD/implementation/mphf_batch_queries.md b/DevDocMD/implementation/mphf_batch_queries.md index 6554f115..f058913b 100644 --- a/DevDocMD/implementation/mphf_batch_queries.md +++ b/DevDocMD/implementation/mphf_batch_queries.md @@ -362,6 +362,8 @@ The items listed as unused in §4 were removed after Serena's `safe_delete_symbo Side effect: `find_strict` was the only reader of the `unitigs` handle that `Hybrid` layers opened, so that field (and the extra `.idx` map and mmap per Hybrid layer) was dropped too. `find` on a Hybrid layer was already a fingerprint check; the exact evidence stays on disk (it gives the slot count and is what `convert` works from) but no API consults it any more. Restoring an exact lookup for Hybrid layers means re-adding `find_strict` and that field. -`ahash` in `obidebruinj/Cargo.toml` is not referenced by any source file of the crate either (not removed: not asked). +`ahash` was not referenced by any source file of `obidebruinj` either and was removed from its `Cargo.toml` too. Checks after the removal: `cargo build --release` without warnings, `cargo test --workspace` 555 passed / 0 failed, `scripts/smoke_test_index.sh` PASS. + +Scratch artifacts of this work were deleted: the intermediate binaries, the two skim indexes (`skim_p4`, `skim_p16`) and the shared data set `benchmark/run/bench_mphf/data` (rebuilt automatically, ≈ 2 min, by the next `bench_mphf.sh`). Kept in `benchmark/run/bench_mphf/`: the original binary `obikmer_baseline` (reference for A/B runs) and the per-label results and checksums (18 MB in all). The 91-genome index converted to the current MPHF format (`/Users/coissac/travail/obiskim/data/phyloalps/bench_mphf/phyloskims_sal_vac_sav_v2`, with its `index.meta` patched, original `index.meta.before_state_fix` beside it) was left in place. diff --git a/src/Cargo.lock b/src/Cargo.lock index 5dc76f63..37bd6251 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -8,19 +8,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "getrandom 0.3.4", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.4" @@ -1419,7 +1406,6 @@ dependencies = [ name = "obidebruinj" version = "0.1.0" dependencies = [ - "ahash", "crossbeam-channel", "hashbrown 0.17.1", "obifastwrite", diff --git a/src/obidebruinj/Cargo.toml b/src/obidebruinj/Cargo.toml index c4d1fdd1..debad64f 100644 --- a/src/obidebruinj/Cargo.toml +++ b/src/obidebruinj/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] obikseq = { path = "../obikseq" } obifastwrite = { path = "../obifastwrite" } -ahash = "0.8" hashbrown = { version = "0.17", features = ["rayon"] } rayon = "1" crossbeam-channel = "0.5" diff --git a/src/obikmer/Cargo.toml b/src/obikmer/Cargo.toml index c736bf61..e9042e6c 100644 --- a/src/obikmer/Cargo.toml +++ b/src/obikmer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "obikmer" -version = "1.3.6" +version = "1.4.0" edition = "2024" [[bin]]