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

Fix picard memory issue #145

Merged
merged 1 commit into from
Feb 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unpublished / Dev Branch]

### `Added`

### `Fixed`
* [#145](https://github.com/nf-core/eager/issues/145) - Added Picard Memory Handling [fix](https://github.com/nf-core/eager/issues/144)


## [2.0.5] - 2019-01-28

### `Added`
Expand Down
5 changes: 4 additions & 1 deletion conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ process {
withName:convertBam {
cpus = { check_max(8 * task.attempt, 'cpus') }
}

withName:makeSeqDict {
memory = { check_max( 16.GB * task.attempt, 'memory' ) }
}

withName:bwa {
memory = { check_max( 16.GB * task.attempt, 'memory' ) }
cpus = { check_max(8 * task.attempt, 'cpus') }
Expand Down
4 changes: 2 additions & 2 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ process makeSeqDict {
mkdir -p seq_dict
mv $fasta "seq_dict/${base}"
cd seq_dict
picard CreateSequenceDictionary R=$base O="${fasta.baseName}.dict"
picard -Xmx${task.memory.toMega()}M -Xms${task.memory.toMega()}M CreateSequenceDictionary R=$base O="${fasta.baseName}.dict"
"""
}

Expand Down Expand Up @@ -970,7 +970,7 @@ process markDup{
script:
prefix = "${bam.baseName}"
"""
picard MarkDuplicates INPUT=$bam OUTPUT=${prefix}.markDup.bam REMOVE_DUPLICATES=TRUE AS=TRUE METRICS_FILE="${prefix}.markdup.metrics" VALIDATION_STRINGENCY=SILENT
picard -Xmx${task.memory.toMega()}M -Xms${task.memory.toMega()}M MarkDuplicates INPUT=$bam OUTPUT=${prefix}.markDup.bam REMOVE_DUPLICATES=TRUE AS=TRUE METRICS_FILE="${prefix}.markdup.metrics" VALIDATION_STRINGENCY=SILENT
"""
}

Expand Down