Skip to content

Conversation

oesteban
Copy link
Contributor

  • Update the nipype interfaces BEDPOSTX and XFibres. BEDPOSTX has a new command line interface as of FSL 5.0, which replicates XFibres interface. Former interface is still available, and usable in nipype using OldBEDPOSTX. XFibres has some new adaptations.
  • Backwards compatibility: old interfaces are kept as OldBEDPOSTX and OldXFibres.
  • Update create_bedpostx_pipeline
  • Created a bedpostx_parallel workflow, that makes a better slicing of data to enable parallel processing in small chunks (when processing diffusion data with many sampled directions, memory consumption explodes even for the slice-by-slice approach).
  • Created two new miscelaneous interfaces (SplitROIs and MergeROIs) as helpers for parallel pipelinings. Also created a regresion test to check consistency between both.
Old interfaces are still available as OldBEDPOSTX and OldXFibres
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) when pulling 3f677eb on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling 0f1c179 on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling 449452f on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) when pulling dc1a4cd on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.05%) when pulling 0de90cf on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) when pulling 6c01665 on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@oesteban oesteban changed the title WIP: [FSL] Update bedpostx and xfibres WIP: [FSL] BEDPOSTX Revisited Sep 12, 2014
@oesteban oesteban changed the title WIP: [FSL] BEDPOSTX Revisited [FSL] BEDPOSTX Revisited Sep 12, 2014
@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) when pulling f177e3f on oesteban:enh/UpdateBEDPOSTX into f626d94 on nipy:master.

@oesteban
Copy link
Contributor Author

I've been executing the new parallel workflow with the HCP data and looks good, but we could benefit from somebody else taking a look on this PR before merging.

@chrisgorgo
Copy link
Member

We are dealing with breaking backward compatibility here. Maybe it's better to add a deprecation warning to the existing interfaces that need updating, create aliases for them with version number in the name (instead of "Old"). This will allow users to use new interfaces (with explicit versioned name) now but will also give other users time to update their code. We will switch the aliases in the next release. What do you think @satra ?

This release
XFibers -> XFibers4
XFibers4 (deprecation warning)
XFibers5

Next release
XFibers -> XFibers5
XFibers4
XFibers5

@satra
Copy link
Member

satra commented Sep 29, 2014

is there any chance we can do it like the FSLGLMInput/OutputSpec?

basically it uses FSL's version to determine what parameters are available. also this resulted in deprecation of ContrastMgr as of FSL 5.0.7.

@satra
Copy link
Member

satra commented Sep 29, 2014

also for BEDPOSTX it would be good to have support for BEDPOSTX_GPU which is simply a change of command.

class BEDPOSTXGPU(BEDPOSTX): _cmd = 'bedpostx_gpu' 
@oesteban
Copy link
Contributor Author

oesteban commented Oct 1, 2014

Ok, I'll have news soon about all these suggestions 👍

@oesteban
Copy link
Contributor Author

oesteban commented Oct 6, 2014

@chrisfilo my last commit should be OK with the new naming convention.

@satra, I've added support to the gpu version, and also implemented the interface choice based on FSL version. Still, I'm unsure about the actual implementation I've done (see this last part: oesteban@2afca1b#diff-367197de1c2db8cdd0dc656b3c96476dR1153)

@satra
Copy link
Member

satra commented Oct 6, 2014

@oesteban - i'll review it later today!

Conflicts:	CHANGES	nipype/algorithms/misc.py	nipype/interfaces/freesurfer/utils.py
@coveralls
Copy link

Coverage Status

Coverage increased (+0.07%) when pulling 6e8c5ae on oesteban:enh/UpdateBEDPOSTX into 9fef6d4 on nipy:master.

@satra
Copy link
Member

satra commented Oct 7, 2014

i'm going through this now. @oesteban - will send a pull-request shortly

satra added 7 commits October 7, 2014 15:11
* upstream/master: typo in nipype/workflows/dmri/fsl/epi.py Add tests [algorithms] Overlap interface revision
* upstream/master: moved the import inside the constructor Fixes nipy#933
* upstream/master: fix: change where nlmeans check is made fix: topup when out_base is a path
@satra
Copy link
Member

satra commented Oct 8, 2014

@oesteban - sent a pull request to your repo

@satra
Copy link
Member

satra commented Oct 9, 2014

the travis error in this is due to the fact when there is no fsl, the auto test i generated for fsl 5.0.7 fails. the test should be skipped if there is no fsl. let me see if there is a quick fix for this.

* master: (59 commits) sty: removed old interface code writer tst: removed test skipping code - can be overwritten easily by adding a named test tst: add generation for removing a test when package is not found tst: updated test for eddy ref: eddy to remove setting inputs tst: fix spm tests fix: environment variable must be a string sty: white spaces enh: add threading option to Eddy fix: set default number of threads for ITK programs to 1 enh: add FAST option for SPM12 Added backward compatibility for old segment. updated docs, deleted older workflows better error reporting add test for niu.Split update auto test added squeeze to split Fixed bug in antsRegistration outputs. Close nipy#944 changelog fixed tests ...
@satra
Copy link
Member

satra commented Oct 15, 2014

@oesteban - just sent a PR to your branch - should help with the tests.

@satra
Copy link
Member

satra commented Oct 16, 2014

@oesteban - for this PR, could you please merge with upstream master, make specs, commit and push? for some reason a couple of files are being included that shouldn't have been.

@oesteban
Copy link
Contributor Author

@satra: true, both test_auto_{BEDPOSTX,XFibres}.py were removed with the commit.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) when pulling 13c7cfa on oesteban:enh/UpdateBEDPOSTX into 6f50ee1 on nipy:master.

@satra
Copy link
Member

satra commented Oct 16, 2014

@oesteban - i'm going to merge this. can you continue testing this with your workflows?

satra added a commit that referenced this pull request Oct 16, 2014
@satra satra merged commit 157e2ad into nipy:master Oct 16, 2014
@oesteban
Copy link
Contributor Author

@satra sure! I'm processing a batch of cases from the HCP

@oesteban oesteban deleted the enh/UpdateBEDPOSTX branch October 16, 2014 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants