Skip to content

Commit

Permalink
Merge pull request #70 from maxibor/dev
Browse files Browse the repository at this point in the history
Fix Spades memory conversion issue
  • Loading branch information
skrakau authored Jul 14, 2020
2 parents e597127 + f1fd624 commit 467b39f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed channel joining for multiple samples causing MetaBAT2 error [#32](https://github.com/nf-core/mag/issues/32)
- Update MetaBAT2 from v2.13 to v2.15
- Fix number of threads used by MetaBAT2 program `jgi_summarize_bam_contig_depths`
- Fix SPAdes memory conversion issue [#70](https://github.com/nf-core/mag/pull/70)
- No more ignoring errors in SPAdes assembly

### `Deprecated`
Expand Down
8 changes: 4 additions & 4 deletions main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -944,12 +944,12 @@ process spadeshybrid {
params.manifest && !params.single_end && !params.skip_spadeshybrid

script:
def maxmem = "${task.memory.toString().replaceAll(/[\sGB]/,'')}"
maxmem = task.memory.toGiga()
if ( !params.spadeshyrid_fix_cpus || task.cpus == params.spadeshybrid_fix_cpus )
"""
metaspades.py \
--threads "${task.cpus}" \
--memory "$maxmem" \
--memory $maxmem \
--pe1-1 ${sr[0]} \
--pe1-2 ${sr[1]} \
--nanopore ${lr} \
Expand Down Expand Up @@ -987,12 +987,12 @@ process spades {
!params.single_end && !params.skip_spades

script:
def maxmem = "${task.memory.toString().replaceAll(/[\sGB]/,'')}"
maxmem = task.memory.toGiga()
if ( !params.spades_fix_cpus || task.cpus == params.spades_fix_cpus )
"""
metaspades.py \
--threads "${task.cpus}" \
--memory "$maxmem" \
--memory $maxmem \
--pe1-1 ${sr[0]} \
--pe1-2 ${sr[1]} \
-o spades
Expand Down

0 comments on commit 467b39f

Please sign in to comment.