-
Notifications
You must be signed in to change notification settings - Fork 532
FIX: Select Eddy command at runtime #1871
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
Conversation
lgtm |
whoops, good catch! |
Codecov Report
@@ Coverage Diff @@
## master #1871 +/- ##
==========================================
- Coverage 72.92% 72.91% -0.01%
==========================================
Files 1061 1061
Lines 53749 53756 +7
Branches 7728 7728
==========================================
+ Hits 39194 39197 +3
- Misses 13341 13345 +4
Partials 1214 1214
Continue to review full report at Codecov.
|
Actually, if |
@effigies - for many things we have class level assignments and instance level assignments. we could potentially support both in this case, but it's less of an issue here. i'm fine with your current changes. |
Thanks for this. I will remove the other issue I've just created: #1876. How are you installing Eddy? The copy I've got is from the Debian version of the Neurodebian package: |
@yarikoptic, @mih - does the neurodebian version still distribute eddy separately? the fsl installer no longer does. |
What's the best way to do a version check? Input spec? And what would be the check? The latest release seems to be 5.0.9, which is what's in Neurodebian. If it's easier, someone feel free to build on my branch and start a new PR. |
For version checking, the |
@alexsavio - do you not have an |
@satra - no I don't. I looked for it, I tried to update my installed package...nothing. I am using the Ubuntu xenial version. |
@alexsavio - it looks like indeed @effigies - we should think about adjusting this interface. |
@satra is |
nipype/interfaces/fsl/epi.py
Outdated
return 'eddy' | ||
|
||
FSLDIR = os.environ['FSLDIR'] | ||
if use_cuda and os.path.exists(os.path.join(FSLDIR, 'eddy_cuda')): |
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.
shouldn't the and
clause be on a separate line? otherwise if cuda is not found it will default to one of openmp or plain eddy.
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 see how this is problematic for a lot of things, but the only thing i was hoping for was to replace eddy_openmp
with eddy
on systems that have eddy but not eddy_openmp at runtime. (so in an overloaded run_interface call.
the previous deleted _use_cuda
seems reasonable here and can also be used in doctests without requiring fsl to be present.
Set _use_cuda to run on trait change Update doctest to show use_cuda behavior
looks good |
👍 LGTM |
Follow-up to #1711