diff --git a/.gitignore b/.gitignore index 23d99d632a8562411417476cc8e2865a295f0ce8..f153fc296faef39fd8ce3be544fdf32b414a32c5 100644 --- a/.gitignore +++ b/.gitignore @@ -301,6 +301,7 @@ $RECYCLE.BIN/ /workflow/work/* /workflow/output/* /.nextflow/* +/data/* /work/* /output/* pipeline_trace*.txt* diff --git a/data/.gitkeep b/data/.gitkeep new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/workflow/conf/biohpc.config b/workflow/conf/biohpc.config index 71409aca77cfb01cb00e863855228276d98edb95..e69f0507b028c493d49bbbada40e051034dc0ac7 100755 --- a/workflow/conf/biohpc.config +++ b/workflow/conf/biohpc.config @@ -9,15 +9,15 @@ process { } $count211 { module = ['cellranger/2.1.1'] - memory = '120GB' + queue = '128GB,256GB,256GBv1,384GB' } $count301 { module = ['cellranger/3.0.1'] - memory = '120GB' + queue = '128GB,256GB,256GBv1,384GB' } $count302 { module = ['cellranger/3.0.2'] - memory = '120GB' + queue = '128GB,256GB,256GBv1,384GB' } } diff --git a/workflow/main.nf b/workflow/main.nf index bb2946dd50a3ec192ccf8c62bf4cec31eb067289..82d30dfbfb02aae0ba5cbaadac9fb0a8b9302ccc 100755 --- a/workflow/main.nf +++ b/workflow/main.nf @@ -73,6 +73,8 @@ process checkDesignFile { script: """ + hostname + ulimit -a module load python/3.6.1-2-anaconda python3 $baseDir/scripts/check_design.py -d $designLocation -f $fastqList """ @@ -106,7 +108,7 @@ chemistryParam301 = chemistryParam chemistryParam302 = chemistryParam process count211 { - memory '120 GB' + queue '128GB,256GB,256GBv1,384GB' tag "count211-$sample" publishDir "$outDir/${task.process}", mode: 'copy' @@ -131,17 +133,21 @@ process count211 { """ if (forceCells211 == 0){ """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --expect-cells=$expectCells211 """ } else { """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --force-cells=$forceCells211 """ } } process count301 { - memory '120 GB' + queue '128GB,256GB,256GBv1,384GB' tag "count301-$sample" publishDir "$outDir/${task.process}", mode: 'copy' @@ -167,17 +173,21 @@ process count301 { """ if (forceCells301 == 0){ """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --expect-cells=$expectCells301 --chemistry="$chemistryParam301" """ } else { """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --force-cells=$forceCells301 --chemistry="$chemistryParam301" """ } } process count302 { - memory '120 GB' + queue '128GB,256GB,256GBv1,384GB' tag "count302-$sample" publishDir "$outDir/${task.process}", mode: 'copy' @@ -203,10 +213,14 @@ process count302 { """ if (forceCells302 == 0){ """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --expect-cells=$expectCells302 --chemistry="$chemistryParam302" """ } else { """ + hostname + ulimit -a cellranger count --id="$sample" --transcriptome="./$ref" --fastqs=. --sample="$sample" --force-cells=$forceCells302 --chemistry="$chemistryParam302" """ }