-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge PR #23441, commits were: * let valet use only one thread for samtools sort with `-@ 16` I get `samtools sort: couldn't allocate memory for bam_mem` seem better anyway with restrictive HPC setups
- Loading branch information
1 parent
c278eba
commit 261d4ba
Showing
2 changed files
with
15 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ source: | |
|
||
build: | ||
noarch: generic | ||
number: 2 | ||
number: 3 | ||
|
||
requirements: | ||
run: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,20 @@ | ||
--- a/src/py/valet.py | ||
+++ b/src/py/valet.py | ||
@@ -13,7 +13,7 @@ import sys | ||
--- src/py/valet.py 2017-08-01 23:04:55.000000000 +0200 | ||
+++ src/py/valet.py 2020-07-29 13:56:29.524490605 +0200 | ||
@@ -13,7 +13,7 @@ | ||
import subprocess | ||
from subprocess import Popen, PIPE | ||
|
||
-BASE_PATH = os.path.dirname(sys.argv[0])[:-len('src/py/')] | ||
+BASE_PATH = os.path.dirname(os.path.realpath(__file__))[:-len('src/py/')] | ||
FILE_LIMIT = resource.getrlimit(resource.RLIMIT_NOFILE)[1] | ||
FNULL = open('/dev/null', 'w') | ||
COMMANDS_FILE = None | ||
COMMANDS_FILE = None | ||
@@ -524,7 +524,7 @@ | ||
call_arr = ["samtools", "view", "-F", "0x100", "-bS", sam_output_location] | ||
run(call_arr, bam_fp, error_fp) | ||
|
||
- call_arr = ["samtools", "sort", "-@ 16", "-o", sorted_bam_location+".bam", bam_location] | ||
+ call_arr = ["samtools", "sort", "-o", sorted_bam_location+".bam", bam_location] | ||
run(call_arr, stderr=FNULL) | ||
|
||
coverage_file_dir = output_dir + "/coverage/" |