-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convert ADAM pipeline to Toil Spark support (resolves #325) #328
Conversation
@fnothaft feel free to take over this PR |
2ce0163
to
a3a266a
Compare
@@ -36,11 +36,12 @@ | |||
|
|||
import yaml | |||
from toil.job import Job |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nit: can you move import yaml
into the earlier block of imports. This way, all of the from toil.*
imports will be in a single block.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently all of the pipelines I refactored have the imports ordered like this as per PEP8 guidelines. I'm happy to change it, but it'll reduce consistency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not suggesting changing the order. I'm suggesting to move the line of whitespace from before import yaml
to after import yaml
so that import yaml
is in the previous block of imports and the second block of imports is just imports from toil.*
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My comment still stands. PEP8 wants a blank line between the standard library imports and third-party imports. I agree with you though that it looks nicer your way.
Other than the one really trivial nit, LGTM! |
@almussel can you fix that nit and squash down? |
Also, can you update the toil min version in |
Will do! Should I go ahead and remove the spark-utils code as well? |
a3a266a
to
c6df6a6
Compare
@@ -33,14 +33,15 @@ | |||
import os | |||
import textwrap | |||
from subprocess import check_call, check_output | |||
|
|||
import yaml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah! I didn't realize yaml
was a 3rd party import. Yes, you're correct then that there should be a space before it. Sorry for the back and forth here.
That'd be great! |
Also, we'll need to change https://github.com/BD2KGenomics/toil-scripts/blob/master/jenkins.sh#L14 to the latest toil version. |
549a815
to
cf5ba5b
Compare
Not really sure where these failures are coming from. The toil version has been updated. |
@jvivian can you look at these test failures? They are in the RNA-seq tests. |
As of Toil 3.2.0 you are no longer allowed to say As for |
Thanks @jvivian! |
@arkal — I followed your advice and still got hit with |
Welp i'm a dumbass and I feel bad. @jvivian it should be
|
Looks like these tests are still failing @jvivian... |
Sorry, I know what it is, just busy on another PR. I'll get to it in a second. |
Ah, no rush. |
EDIT: It was actually a rename in a job function, so I'll skip the |
RNA-seq passes now, different test is failing due to cache assertion regarding disk space. I've added in |
Working on the disk issue with @arkal . I could set tmpdir in |
Yes John, it's as I suspected.... *args does not contain disk, mem or cpus.
and the stack trace has
see the last line. only ('a', 'b', 'c'). Hope this helps |
BD2KGenomics/cgcloud#194 caused toil-jenkins-slave to only half the possible ephemeral space (70GB instead of 140GB). That's fixed now and according to @arkal, should fix the build problem caused by lack of disk space. |
Sorry for the hold up on this. I'll merge #316 once it's finished CI and then use the function it's introducing to fix the |
I will be testing this patch this AM, so even if tests pass, please hold for me to merge. |
Working on my fix now. |
@fnothaft — I rebased onto master (no conflicts) for my fix. Ping me if you're fine with me force pushing. |
@jvivian force push is OK here. |
0879a99
to
405f534
Compare
I'll rebase the bwa-alignment PR on this once it's merged. |
Note to self: we need some documentation updates to the ADAM uberscript. I'll circle back on that later. |
So, no dice on this right now. Still debugging what's going wrong, but the ADAM pipeline is not running on the cluster properly. It isn't throwing an error, which is weird, but it is definitely not running. |
@fnothaft @jvivian @hannes-ucsc Are you all okay with me force pushing to this branch again? |
SGTM! |
Fine with me as well On Wed, Jul 13, 2016 at 3:59 PM Frank Austin Nothaft <
|
405f534
to
95bc9ed
Compare
yes |
08cc89b
to
9de9f64
Compare
I've moved this work over to #351 for testing. Closing. |
No description provided.