From 811745ca8afc53382b47cea12fc321b107b596a2 Mon Sep 17 00:00:00 2001 From: Laurent Modolo <laurent.modolo@ens-lyon.fr> Date: Wed, 30 Aug 2023 11:36:29 +0200 Subject: [PATCH] block clustering --- src/main.nf | 5 ++++- src/modules/kmerclust.nf | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main.nf b/src/main.nf index 174ca75..a8d444b 100644 --- a/src/main.nf +++ b/src/main.nf @@ -32,7 +32,10 @@ workflow { MERGEKMER(FASTKMERS.out.csv.groupTuple()) COLLATEKMER(MERGEKMER.out.csv.map{it -> [it[0].specie, it[1]] }.groupTuple()) KMERCLUST_LOAD(COLLATEKMER.out.csv, params_csv.collect()) - KMERCLUST(Channel.of(1..params.bootstrap).combine(KMERCLUST_LOAD.out.rdata)) +/* + KMERCLUST(KMERCLUST_LOAD.out.rdata) + KMERCLUST_BOOT(Channel.of(1..params.bootstrap).combine(KMERCLUST_LOAD.out.rdata)) KMERCLUST_MERGE(KMERCLUST.out.rdata.groupTuple()) KMERCLUST_PLOT(KMERCLUST_MERGE.out.rdata.mix(KMERCLUST_LOAD.out.rdata).groupTuple()) +*/ } diff --git a/src/modules/kmerclust.nf b/src/modules/kmerclust.nf index 61feec6..150c114 100644 --- a/src/modules/kmerclust.nf +++ b/src/modules/kmerclust.nf @@ -2,7 +2,7 @@ process KMERCLUST_LOAD { tag "$specie" label 'big_mem_mono_cpus' - container "lbmc/kmerclust:0.0.3" + container "lbmc/kmerclust:0.0.4" input: tuple val(specie), path(csv) @@ -19,7 +19,7 @@ process KMERCLUST_LOAD { cat <<-END_VERSIONS > versions.yml "${task.process}": - Rkmerclust: 0.0.3 + Rkmerclust: 0.0.4 END_VERSIONS """ } @@ -28,7 +28,7 @@ process KMERCLUST_BOOT { tag "$specie" label 'big_mem_multi_cpus' - container "lbmc/kmerclust:0.0.3" + container "lbmc/kmerclust:0.0.4" publishDir "results/${params.kmer_size}/${specie}/", mode: 'copy' input: @@ -45,7 +45,7 @@ process KMERCLUST_BOOT { cat <<-END_VERSIONS > versions.yml "${task.process}": - Rkmerclust: 0.0.3 + Rkmerclust: 0.0.4 END_VERSIONS """ } @@ -54,7 +54,7 @@ process KMERCLUST { tag "$specie" label 'big_mem_multi_cpus' - container "lbmc/kmerclust:0.0.3" + container "lbmc/kmerclust:0.0.4" publishDir "results/${params.kmer_size}/${specie}/", mode: 'copy' input: @@ -71,7 +71,7 @@ process KMERCLUST { cat <<-END_VERSIONS > versions.yml "${task.process}": - Rkmerclust: 0.0.3 + Rkmerclust: 0.0.4 END_VERSIONS """ } @@ -80,7 +80,7 @@ process KMERCLUST_MERGE { tag "$specie" label 'big_mem_mono_cpus' - container "lbmc/kmerclust:0.0.3" + container "lbmc/kmerclust:0.0.4" publishDir "results/${params.kmer_size}/${specie}/", mode: 'copy' input: @@ -97,7 +97,7 @@ process KMERCLUST_MERGE { cat <<-END_VERSIONS > versions.yml "${task.process}": - Rkmerclust: 0.0.3 + Rkmerclust: 0.0.4 END_VERSIONS """ } @@ -106,7 +106,7 @@ process KMERCLUST_PLOT { tag "$specie" label 'big_mem_mono_cpus' - container "lbmc/kmerclust:0.0.3" + container "lbmc/kmerclust:0.0.4" publishDir "results/${params.kmer_size}/${specie}/", mode: 'copy' input: @@ -123,7 +123,7 @@ process KMERCLUST_PLOT { cat <<-END_VERSIONS > versions.yml "${task.process}": - Rkmerclust: 0.0.3 + Rkmerclust: 0.0.4 END_VERSIONS """ } -- GitLab