Skip to content

Commit 88924e1

Browse files
committed
Fix: Increasing memory and wall times and updating groups parser.
1 parent 601fd9f commit 88924e1

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

config/cluster.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__default__": {
33
"threads": "4",
4-
"mem": "8g",
5-
"time": "0-04:00:00"
4+
"mem": "16g",
5+
"time": "0-18:00:00"
66
}
77
}

src/files.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,20 @@ def check_file(file, ncols, delim='\t'):
5858
for line in fh:
5959
linenumber += 1
6060
linelist = [l.strip() for l in line.split(delim) if l.strip()]
61-
if len(linelist) <= ncols or len(linelist) == 0:
61+
if len(linelist) == 0:
6262
# Skip over lines with the expected
6363
# number of columns and empty line
6464
continue
65-
# Line is missing a column or it is not
66-
# tab delimited
67-
errors = True
68-
err(
69-
'{}{}Error: --groups "{}" file does not contain the expected number of columns at line {}! {}'.format(
70-
c.bg_red, c.white, file, linenumber, c.end
65+
if len(linelist) <= ncols:
66+
# Line is missing a column or it is not
67+
# tab delimited
68+
errors = True
69+
err(
70+
'{}{}Error: --groups "{}" file does not contain the expected number of columns at line {}! {}'.format(
71+
c.bg_red, c.white, file, linenumber, c.end
72+
)
7173
)
72-
)
73-
err('{}{} └── Bad line contents: "{}" {}'.format(c.bg_red, c.white, line.rstrip(), c.end))
74+
err('{}{} └── Bad line contents: "{}" {}'.format(c.bg_red, c.white, line.rstrip(), c.end))
7475
if errors:
7576
fatal(
7677
'{}{}Fatal: Please correct these lines and check your file is tab-delimited! {}'.format(

src/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function submit(){
189189
#!/usr/bin/env bash
190190
#SBATCH --cpus-per-task=6
191191
#SBATCH --mem=24g
192-
#SBATCH --time=8-00:00:00
192+
#SBATCH --time=10-00:00:00
193193
#SBATCH --parsable
194194
#SBATCH -J "$2"
195195
#SBATCH --mail-type=BEGIN,END,FAIL

0 commit comments

Comments
 (0)