From fc07d4c498f808920db653c1b04580d1a8790154 Mon Sep 17 00:00:00 2001 From: Jakob Nybo Nissen Date: Tue, 12 Sep 2023 16:03:59 +0200 Subject: [PATCH] Bugfix: Instantiate clusterer properly Fix bug intoduced in #6554009, where the changes were not respected in __main__.py --- vamb/__main__.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/vamb/__main__.py b/vamb/__main__.py index 79214063..3b4547bf 100755 --- a/vamb/__main__.py +++ b/vamb/__main__.py @@ -607,6 +607,7 @@ def cluster( cluster_options: ClusterOptions, clusterspath: Path, latent: np.ndarray, + lengths: np.ndarray, contignames: Sequence[str], # of dtype object vamb_options: VambOptions, logfile: IO[str], @@ -636,12 +637,13 @@ def cluster( cluster_generator = vamb.cluster.ClusterGenerator( latent, + lengths, windowsize=cluster_options.window_size, minsuccesses=cluster_options.min_successes, destroy=True, normalized=False, cuda=vamb_options.cuda, - seed=vamb_options.seed, + rng_seed=vamb_options.seed, ) renamed = ( @@ -832,6 +834,7 @@ def run( cluster_options, clusterspath, latent, + comp_metadata.lengths, comp_metadata.identifiers, vamb_options, logfile, @@ -870,6 +873,7 @@ def run( cluster_options, clusterspath, latent_z, + comp_metadata.lengths, comp_metadata.identifiers, vamb_options, logfile, @@ -1239,16 +1243,16 @@ def main(): dest="window_size", metavar="", type=int, - default=200, - help="size of window to count successes [200]", + default=300, + help="size of window to count successes [300]", ) clusto.add_argument( "-u", dest="min_successes", metavar="", type=int, - default=20, - help="minimum success in window [20]", + default=15, + help="minimum success in window [15]", ) clusto.add_argument( "-i",