Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kmer preclustering #92

Closed
wants to merge 38 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d5d191e
towards allowing independent sample clusterings
AroneyS Dec 5, 2023
e5e9cb1
move preclusters to params
AroneyS Dec 5, 2023
bbf161f
get correct checkpoint output
AroneyS Dec 5, 2023
601c38d
fix target_elusive and cluster_graph rules
AroneyS Dec 5, 2023
68e8a2d
change final rule for tests
AroneyS Dec 5, 2023
31a98df
fix another final rule for tests
AroneyS Dec 5, 2023
71f488e
fix build
AroneyS Dec 5, 2023
e993cd3
group targets and edges with target prefix
AroneyS Dec 5, 2023
530d281
group clusters with overall reorder and rename
AroneyS Dec 5, 2023
962e069
add sourmash to Ibis env
AroneyS Dec 5, 2023
779d9ba
initial sourmash clustering ideas
AroneyS Dec 6, 2023
c916d22
kmer clustering with sourmash api and scipy
AroneyS Dec 6, 2023
6cd3406
fix is_in
AroneyS Dec 6, 2023
547de2e
remove deprecated working_dir
AroneyS Dec 6, 2023
0c4bbdf
add new args without implementation
AroneyS Dec 6, 2023
e29380b
save precluster clusters to file
AroneyS Dec 6, 2023
a1717d2
implement kmer-precluster arg
AroneyS Dec 6, 2023
963baa4
fix build
AroneyS Dec 6, 2023
6c5baa0
add target taxa filtering to precluster_samples
AroneyS Dec 6, 2023
f007707
fix build test
AroneyS Dec 6, 2023
ff51594
account for Ns in otu sequences
AroneyS Dec 7, 2023
c410df1
remove edges and targets combined outputs
AroneyS Dec 7, 2023
9f20c87
add cluster logging
AroneyS Dec 7, 2023
92cfa9b
switch to multithreaded distance calculations
AroneyS Dec 8, 2023
105655c
chunk distance calculations
AroneyS Dec 8, 2023
4e5340f
fix linkage and cluster method calls
AroneyS Dec 8, 2023
7577088
switch to spawn method
AroneyS Dec 8, 2023
4250c20
increase t precision
AroneyS Dec 8, 2023
1dcdfdb
change chunking
AroneyS Dec 11, 2023
2a502fc
add scaled test
AroneyS Dec 11, 2023
3430a9a
separate sketch and distance from preclustering
AroneyS Dec 12, 2023
713eda6
fix test filename
AroneyS Dec 12, 2023
5f99000
switch to single linkage
AroneyS Dec 12, 2023
9f79cfb
set criterion to inconsistent
AroneyS Dec 12, 2023
df2c334
choose largest cluster with size < cutoff for each sample
AroneyS Dec 12, 2023
4b6113c
switch to iterative clustering
AroneyS Dec 12, 2023
8d213eb
update kmer-precluster-samples
AroneyS Jan 5, 2024
53db344
fix residual ibis names
AroneyS Jan 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix residual ibis names
AroneyS committed Jan 7, 2024
commit 53db3447bd733f2f0d6d1bf659fe990d71a31dab
4 changes: 2 additions & 2 deletions test/test_coassemble.py
Original file line number Diff line number Diff line change
@@ -1182,7 +1182,7 @@ def test_coassemble_remove_EIF(self):
def test_coassemble_preclustered(self):
with in_tempdir():
cmd = (
f"ibis coassemble "
f"binchicken coassemble "
f"--forward {SAMPLE_READS_FORWARD_PRE} "
f"--reverse {SAMPLE_READS_REVERSE_PRE} "
f"--sample-singlem {SAMPLE_SINGLEM_PRE} "
@@ -1261,7 +1261,7 @@ def test_coassemble_preclustered(self):
def test_coassemble_preclustered_target_taxa(self):
with in_tempdir():
cmd = (
f"ibis coassemble "
f"binchicken coassemble "
f"--forward {SAMPLE_READS_FORWARD_PRE} "
f"--reverse {SAMPLE_READS_REVERSE_PRE} "
f"--sample-singlem {SAMPLE_SINGLEM_PRE} "
2 changes: 1 addition & 1 deletion test/test_group_clusters.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
os.environ["POLARS_MAX_THREADS"] = "1"
import polars as pl
from polars.testing import assert_frame_equal
from ibis.workflow.scripts.group_clusters import edges_processing, targets_processing, cluster_processing
from binchicken.workflow.scripts.group_clusters import edges_processing, targets_processing, cluster_processing

EDGES_COLUMNS={
"style": str,
2 changes: 1 addition & 1 deletion test/test_precluster_samples.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

import unittest
import numpy as np
from ibis.workflow.scripts.precluster_samples import processing
from binchicken.workflow.scripts.precluster_samples import processing

class Tests(unittest.TestCase):
def assertListListEqual(self, a, b):
2 changes: 1 addition & 1 deletion test/test_sketch_samples.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
import os
os.environ["POLARS_MAX_THREADS"] = "1"
import polars as pl
from ibis.workflow.scripts.sketch_samples import processing
from binchicken.workflow.scripts.sketch_samples import processing

OTU_TABLE_COLUMNS = {
"gene": str,