Skip to content

Commit 9bd8e5e

Browse files
authored
scratch scratch scratch (#33)
* helper script to index at start of module3..could be use for all modules * increment version for cmo_index, etc * initial commit of cmo_index * logging * cmo_split_reads now opens and emits gzips..slow bc native python gzip instead of subprocess zcat * add logger function * use bufferereader for speed improvement on gzip * increment version * version increment AGAIN * install cmo_fillout * longer delay for polling * speed improvement for split_reads...hopefully... * increment version for release * fake gz files for trimgalore * use args.version * dumbass tmpdir * conflicts committed great * fix tmpdir for diff env, add scratch to mutect * stupid threads arg * Update _version.py
1 parent 231b3e4 commit 9bd8e5e

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

bin/cmo_pindel

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ def run_pindel(pindel_version, args):
4040
if value:
4141
if value == True:
4242
command = command + ["--"+argument.replace("_","-")]
43+
elif argument=="number_of_threads":
44+
command = command + ["--"+argument, value]
4345
else:
4446
command = command + ["--"+argument.replace("_","-"), value]
4547
print >>sys.stderr, " ".join(command)

cmo/_version.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
# This file is originally generated from Git information by running 'setup.py
33
# version'. Distribution tarballs contain a pre-generated copy of this file.
44

5-
__version__ = '1.4.1'
6-
5+
__version__ = '1.4.3'

cmo/gatk.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
import os, sys
22
from . import util
3-
3+
logger = util.get_logger()
44

55

66

77
class Gatk:
8-
def __init__(self,version="default", java_version="default", java_args="-Xmx48g -Xms256m -XX:-UseGCOverheadLimit", temp_dir=None, mutect=False):
8+
def __init__(self,version="default", java_version="default", java_args="-Xmx48g -Xms256m -XX:-UseGCOverheadLimit -Djava.io.tmpdir=/scratch/", temp_dir="/scratch", mutect=False):
99
try:
1010
if mutect:
1111
self.gatk_jar=util.programs["mutect"][version]
1212
else:
1313
self.gatk_jar=util.programs["gatk"][version]
1414
except KeyError, e:
15-
print >>sys.stderr, "Cannot find specified version of gatk in configuration file: %s" % version
15+
logger.critical("Cannot find specified version of gatk in configuration file: %s" % version)
1616
sys.exit(1)
1717
try:
1818
self.java_cmd=util.programs["java"][java_version]
1919
except KeyError, e:
20-
print >>sys.stderr, "Cannot find specified version of java to run gatk with: %s" % java_version
20+
logger.critical("Cannot find specified version of java to run gatk with: %s" % java_version)
2121
sys.exit(1)
2222
self.temp_dir=None
2323
if temp_dir:
2424
self.temp_dir = temp_dir
2525
self.java_args = java_args
26-
print "selected %s" % self.gatk_jar
26+
logger.info("selected %s" % self.gatk_jar)
2727
def gatk_cmd(self, command, java_args_override=None, command_specific_args={}):
2828
cmd = [self.java_cmd, self.java_args]
2929
if(self.temp_dir != None):

test/test_production_commands.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
output2 = None
2929
def setup_module():
3030
global TEST_TEMP_DIR
31-
TEST_TEMP_DIR = tempfile.mkdtemp();
31+
if os.path.exists("/scratch"):
32+
TEST_TEMP_DIR = tempfile.mkdtemp(dir="/scratch");
33+
else:
34+
TEST_TEMP_DIR = tempfile.mkdtemp();
3235
global output
3336
output= os.path.join(TEST_TEMP_DIR, "output")
3437
global output2

0 commit comments

Comments
 (0)