Skip to content

ENH+FIX: Add 3dTproject AFNI interface, Fix OneDToolPy, Add -noFDR flag to 3dDeconvolve #2426

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

Merged
merged 11 commits into from
Feb 13, 2018

Conversation

mvdoc
Copy link
Member

@mvdoc mvdoc commented Feb 3, 2018

Changes proposed in this pull request

  • Add interfaces.afni.preprocess.TProject wrapping 3dTproject
  • Fix out_file for OneDToolPy if censor_motion is set
  • Add -noFDR flag to 3dDeconvolve
  • Change jobs to num_threads in 3dDeconvolve for consistency with other interfaces

@mvdoc mvdoc changed the title ENH+FIX: Add 3dTproject AFNI interface ENH+FIX: Add 3dTproject AFNI interface, Fix OneDToolPy, Add -noFDR flag to 3dDeconvolve Feb 6, 2018
@mvdoc
Copy link
Member Author

mvdoc commented Feb 6, 2018

@effigies @mgxd I'm trying to fix 3dDeconvolve in that if I specify a number of jobs, MultiProc still believe it needs only one proc, see example below (-jobs was set to 24)

[MultiProc] Running 1 tasks, and 0 jobs ready. Free memory (GB): 1360.18/1360.38, Free processors: 23/24.

I tried to set num_threads but it didn't work. How should I fix this?

Thanks

@effigies
Copy link
Member

effigies commented Feb 7, 2018

You can set n_procs=24 as a Node() argument. But perhaps it would be better to change the jobs input to num_threads to be consistent with other interfaces, since that is automatically synced with node.n_procs.

Copy link
Member

@effigies effigies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Minor comments.

* This is a file of 1s and 0s, indicating which
time points are to be included (1) and which are
to be excluded (0).""",
argstr="-censor %s")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be an input, so I think you probably need exists=True?

bandpass = traits.Tuple(
traits.Float, traits.Float,
desc="""Remove all frequencies EXCEPT those in the range""",
argstr='-bandpass %f %f')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to use %g, which will generally give you nicer formatting? e.g. 2 vs 2.0000 or 1.395 vs 1.3949999999.

There are some other instances of %f in here. Your call whether to switch to %g.

@mvdoc
Copy link
Member Author

mvdoc commented Feb 7, 2018

Thanks for the comments @effigies . Added some changes

@@ -153,7 +153,7 @@ class DeconvolveInputSpec(AFNICommandInputSpec):
'instead of the bucket dataset, if possible.',
argstr='-cbucket %s')
out_file = File(desc='output statistics file', argstr='-bucket %s')
jobs = traits.Int(
num_threads = traits.Int(
desc='run the program with provided number of sub-processes',
argstr='-jobs %d')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to set this to nohash=True, unless there's reason to think the number of threads affects the output.

@satra
Copy link
Member

satra commented Feb 11, 2018

@effigies - do you think the error we see is likely because of pybids changes, since we pull pybids from github master. i think i saw a reorganization of the dataset email somewhere.

'/home/travis/pybids/bids/grabbids/tests/data/ds005'

@effigies
Copy link
Member

effigies commented Feb 12, 2018 via email

@satra
Copy link
Member

satra commented Feb 12, 2018

@mvdoc - could you please merge with master and push? that should fix the travis error

* master: (32 commits)
  DOC: Use pip-packaged numpydoc
  FIX: Update pybids data directory
  sty: spacing
  enh: improve travis build reliability
  enh: add test from nipy#2431
  fix: set _id property of cloned node too
  fix: syntax
  sty: pep8 and better error messages
  Fix expected CL in doctest
  Change auto test accordingly
  enh+sty: autotest and styling
  enh: add c3d and c4d interface
  Fix issue nipy#2408
  fix: updated custom search to current api
  fix out_file template bugs
  FIX: Do not cache grab_exts
  fix: remove deprecated output from _list_outputs
  ENH: Reorder traits for better error message
  ENH: Add info to ImageFile for better error messages
  ENH: Simplify listifying logic
  ...
@mvdoc
Copy link
Member Author

mvdoc commented Feb 12, 2018

@satra done

@effigies effigies added this to the 1.0.1 milestone Feb 13, 2018
@effigies effigies merged commit e0d829e into nipy:master Feb 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants