diff --git a/src/Snakefiles/functions.sm b/src/Snakefiles/functions.sm index 34625eb2..c95d286b 100644 --- a/src/Snakefiles/functions.sm +++ b/src/Snakefiles/functions.sm @@ -114,13 +114,13 @@ def getMBGMemoryRequest(attempt): # Sum the input size, divide by return int(math.ceil(math.ceil(mem)*scl)) def getBuildPackagesInputONT(wildcards, withONT, withBAM): - result = "" + result = [] if withONT == "True": if withBAM == "True": result=expand("../3-align/split/ont{nnnn}.fasta.gz", nnnn = splitONToutputs(wildcards)) else: - result = "../%s"%(rules.extractONT.output.ont_subset) + result.append("../%s"%(rules.extractONT.output.ont_subset)) return result def getBuildPackageMemoryRequest(attempt): # Sum the size of input files, 2-bit encoded, @@ -132,6 +132,8 @@ def getBuildPackageMemoryRequest(attempt): # Sum the size of input files, 2 mem = 0 for f in getBuildPackagesInputONT("", config['withONT'], config['withBAM']): + # strip leading ../ from name, we need it for buildPackages but not here + if f.startswith("../"): f = f[3:] mem += getFileBP(f) for f in HIFI_READS: diff --git a/src/canu b/src/canu index afd271c8..e4386f9c 160000 --- a/src/canu +++ b/src/canu @@ -1 +1 @@ -Subproject commit afd271c87e18a48a8dbc904d2f0e526addbed188 +Subproject commit e4386f9ca5452d059cffb0b7e7f19e2e1521bb63