Merge branch 'latest' of github.com:sourmash-bio/sourmash into gather…

…_stats_refactor
sourmash-bio · Oct 15, 2024 · 03102a5 · 03102a5
2 parents 405c518 + 7d11173
commit 03102a5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 26 deletions.
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -46,7 +46,7 @@ jobs:
           python-version: '3.10'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.2
+        uses: pypa/cibuildwheel@v2.21.3
         env:
           CIBW_ENVIRONMENT_MACOS: ${{ matrix.macos_target }}
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.2
+        uses: pypa/cibuildwheel@v2.21.3
         env:
           CIBW_PLATFORM: pyodide 
           CIBW_BUILD: 'cp312-pyodide_wasm32'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml
@@ -97,7 +97,7 @@ skip_feature_sets = [
 
 [target.'cfg(all(target_arch = "wasm32", target_os="unknown"))'.dependencies]
 js-sys = "0.3.68"
-web-sys = { version = "0.3.70", features = ["console", "File", "FileReaderSync"] }
+web-sys = { version = "0.3.72", features = ["console", "File", "FileReaderSync"] }
 wasm-bindgen = "0.2.89"
 getrandom = { version = "0.2", features = ["js"] }
 

diff --git a/src/core/src/index/mod.rs b/src/core/src/index/mod.rs
@@ -17,6 +17,7 @@ use getset::{CopyGetters, Getters, Setters};
 use log::trace;
 use serde::{Deserialize, Serialize};
 use stats::{median, stddev};
+use std::cmp::max;
 use typed_builder::TypedBuilder;
 
 use crate::ani_utils::{ani_ci_from_containment, ani_from_containment};

diff --git a/src/core/src/index/revindex/disk_revindex.rs b/src/core/src/index/revindex/disk_revindex.rs
@@ -395,18 +395,12 @@ impl RevIndexOps for RevIndex {
 
             let match_sig = self.collection.sig_for_dataset(dataset_id)?;
             let match_mh = match_sig.minhash().unwrap().clone();
-
-            // make downsampled minhashes
-            let max_scaled = max(match_mh.scaled(), query.scaled());
+            let scaled = query.scaled();
 
             let match_mh = match_mh
-                .downsample_scaled(max_scaled)
+                .downsample_scaled(scaled)
                 .expect("cannot downsample match");
-
-            query = query
-                .downsample_scaled(max_scaled)
-                .expect("cannot downsample query");
-            let query_mh = KmerMinHash::from(query.clone());
+>>>>>>> 7d111732d66faa0f957f7612d39f50e0d05aff01
 
             // just calculate essentials here
             let gather_result_rank = matches.len();