use sigstrait isntead

sourmash-bio · Jan 6, 2025 · 9195f7c · 9195f7c
1 parent 0b4ab0a
commit 9195f7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,7 @@ crate-type = ["cdylib"]
 pyo3 = { version = "0.23.3", features = ["extension-module", "anyhow"] }
 rayon = "1.10.0"
 serde = { version = "1.0.217", features = ["derive"] }
-#sourmash = { version = "0.18.0", features = ["branchwater"] }
-sourmash = { git = "https://github.com/sourmash-bio/sourmash.git", branch = "add-nhashes", features = ["branchwater"] }
+sourmash = { version = "0.18.0", features = ["branchwater"] }
 serde_json = "1.0.134"
 niffler = "2.4.0"
 log = "0.4.22"

diff --git a/src/utils/buildutils.rs b/src/utils/buildutils.rs
@@ -12,6 +12,7 @@ use sourmash::errors::SourmashError;
 use sourmash::manifest::Record;
 use sourmash::selection::Selection;
 use sourmash::signature::Signature;
+use sourmash::signature::SigsTrait;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::fmt::Display;
@@ -889,7 +890,7 @@ impl BuildCollection {
                 record.set_filename(Some(filename.clone()));
                 record.set_md5(Some(sig.md5sum()));
                 record.set_md5short(Some(sig.md5sum()[0..8].into()));
-                record.set_n_hashes(Some(sig.n_hashes()));
+                record.set_n_hashes(Some(sig.minhash().map(|mh| mh.size()).unwrap_or(0)));
 
                 // note, this needs to be set when writing sigs (not here)
                 // record.set_internal_location("")