diff --git a/Snakemake/IMAGE_calling/Snakefile b/Snakemake/IMAGE_calling/Snakefile index 34abbf629627d1a2f775b47c79cc06f2ef51a274..aa19053b4cb5190e74f15437f97ac69bdb538a07 100755 --- a/Snakemake/IMAGE_calling/Snakefile +++ b/Snakemake/IMAGE_calling/Snakefile @@ -39,8 +39,8 @@ rule_resources = { "bwa_mem" : ["cpu"], "sample_merge" : ["mem"], "markduplicates" : ["mem"], - "RealignerTargetCreator" : ["mem", "cpu"], - "IndelRealigner" : ["mem", "cpu"], + "RealignerTargetCreator" : ["mem"], + "IndelRealigner" : ["mem"], "qualimap" : ["mem", "cpu"], "BaseRecalibrator_1" : ["mem" , "cpu"], "PrintReads" : ["mem" , "cpu"], @@ -48,7 +48,7 @@ rule_resources = { "AnalyzeCovariates" : ["mem"], "HaplotypeCaller" : ["mem","cpu"], "CombineGVCFs" : ["mem"], - "GenotypeGVCFs" : ["mem", "cpu"], + "GenotypeGVCFs" : ["mem"], "bcftools_stats_gatk": ["cpu"], "bcftools_stats_freebayes": ["cpu"], "bcftools_stats_mpileup": ["cpu"] diff --git a/Snakemake/IMAGE_calling/resources_SLURM_memGlobal.yaml b/Snakemake/IMAGE_calling/resources_SLURM_memGlobal.yaml index d5fb39074b2c0342e39e31b44b9ad26ed4ea2f56..06cc2956b2a287e0887dfacec91ad91bf1aeb0f4 100644 --- a/Snakemake/IMAGE_calling/resources_SLURM_memGlobal.yaml +++ b/Snakemake/IMAGE_calling/resources_SLURM_memGlobal.yaml @@ -19,11 +19,9 @@ markduplicates: RealignerTargetCreator: mem: "30G" - cpu : 8 IndelRealigner: mem: "30G" - cpu : 8 BaseRecalibrator_1: mem: "50G" @@ -55,7 +53,6 @@ CombineGVCFs : GenotypeGVCFs : mem : "60G" - cpu : 8 partition : "unlimitq" freebayes: diff --git a/Snakemake/IMAGE_calling/rules/combine_genotypeGVCF.rules b/Snakemake/IMAGE_calling/rules/combine_genotypeGVCF.rules index 128b1a3cdeee09d020bc1cf0666826618aafd88b..54326022046c42d87e0403a5a11d70ba54331d72 100644 --- a/Snakemake/IMAGE_calling/rules/combine_genotypeGVCF.rules +++ b/Snakemake/IMAGE_calling/rules/combine_genotypeGVCF.rules @@ -61,7 +61,7 @@ def get_cohor_gvcf(wildcards): rule GenotypeGVCFs: input: - gvcf=get_cohor_gvcf, + gvcfs=get_cohor_gvcf, ref=config["reference_genome"] output: @@ -70,13 +70,11 @@ rule GenotypeGVCFs: log: "results/gatk_haplotypecaller/logs/GenotypeGVCFs.log" - threads: config["GenotypeGVCFs"]["cpu"] - params: mem=config["GenotypeGVCFs"]["mem"] - shell: - """ - java -Xmx{params.mem} -jar {config[bin][gatk]} -T GenotypeGVCFs -nct {threads} -R {input.ref} --variant {input.gvcf} -o {output} 2> {log} - {config[bin][tabix]} -f -p vcf {output} - """ + + run: + gvcfs=" --variant ".join(input.gvcfs) + shell("java -Xmx{params.mem} -jar {config[bin][gatk]} -T GenotypeGVCFs -R {input.ref} --variant {gvcfs} -o {output} 2> {log}") + diff --git a/Snakemake/IMAGE_calling/rules/realignment.rules b/Snakemake/IMAGE_calling/rules/realignment.rules index 7d6493d162af924c0dba1218a5269549b18acce0..e2bb3d1b40bd531ab9e37719b22e66962f443184 100644 --- a/Snakemake/IMAGE_calling/rules/realignment.rules +++ b/Snakemake/IMAGE_calling/rules/realignment.rules @@ -16,8 +16,6 @@ rule RealignerTargetCreator: output: temp("results/gatk_realignment/{sample}.rg.sort.md.intervals") - threads: config["RealignerTargetCreator"]["cpu"] - log: stderr="results/gatk_realignment/logs/{sample}_RealignerTargetCreator.stderr", stdout="results/gatk_realignment/logs/{sample}_RealignerTargetCreator.stdout" @@ -26,7 +24,7 @@ rule RealignerTargetCreator: mem= config["RealignerTargetCreator"]["mem"] shell: - "java -Xmx{params.mem} -jar {config[bin][gatk]} -T RealignerTargetCreator --allow_potentially_misencoded_quality_scores -nct {threads} -R {input.ref} -I {input.bam} -o {output} 2> {log.stderr} > {log.stdout}" + "java -Xmx{params.mem} -jar {config[bin][gatk]} -T RealignerTargetCreator --allow_potentially_misencoded_quality_scores -R {input.ref} -I {input.bam} -o {output} 2> {log.stderr} > {log.stdout}" rule IndelRealigner: input: @@ -38,8 +36,6 @@ rule IndelRealigner: output: temp("results/gatk_realignment/{sample}.rg.sort.md.real.bai"), bam=temp("results/gatk_realignment/{sample}.rg.sort.md.real.bam") - - threads: config["IndelRealigner"]["cpu"] log: stderr="results/gatk_realignment/logs/{sample}_IndelRealigner.stderr", @@ -49,4 +45,4 @@ rule IndelRealigner: mem= config["IndelRealigner"]["mem"] shell: - "java -Xmx{params.mem} -jar {config[bin][gatk]} -T IndelRealigner --allow_potentially_misencoded_quality_scores -nct {threads} -R {input.ref} -I {input.bam} -targetIntervals {input.intervals} -o {output.bam} 2> {log.stderr} > {log.stdout}" + "java -Xmx{params.mem} -jar {config[bin][gatk]} -T IndelRealigner --allow_potentially_misencoded_quality_scores -R {input.ref} -I {input.bam} -targetIntervals {input.intervals} -o {output.bam} 2> {log.stderr} > {log.stdout}"