Skip to content

New interfaces #1460

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 55 commits into from
May 30, 2016
Merged

New interfaces #1460

merged 55 commits into from
May 30, 2016

Conversation

pintohutch
Copy link
Contributor

Added new afni interfaces for: 3dECM, 3dDegreeCentrality, 3dLFCD, 3dClipLevel, 3dmask_tool, and 3dSeg as well as their unit tests

pintohutch and others added 30 commits January 13, 2016 14:25
@pintohutch
Removed S3 datasink stuff
b5a6024
@pintohutch
Started adding in logic for num_threads and changed names of real mem…
70ca457 
…ory stats keys
@pintohutch
Added cmd-level threads and memory profiling
36e1446
@pintohutch
Resolved conflicts from re-basing and pulling in nipype master
61b8d0c
@pintohutch
Merge branch 'nipy-master' into resource_multiproc
a3c9be7
@carolFrohlich
remove MultiProc, MultiprocPlugin is default
43c0d56
@carolFrohlich
change old namespaces
0bb6d79
@pintohutch
Added initial num_threads monitoring code
a68e0e6
@pintohutch
Merged Carol's changes
5dac574
@sgiavasis
Merge pull request #8 from nipy/master
e40e305 
Update fork
@pintohutch
Manual merge of s3_datasink and resource_multiproc branch for cpac run
97e7333
@pintohutch
Manual merge of s3_datasink and resource_multiproc branch for cpac run
08a485d
@pintohutch
Changed resources fetching to its function and try-blocked it in case…
e5945e9 
… of dying processes
@pintohutch
Fixed pickling bug of instance method by passing profiling flag inste…
9cb7a68 
…ad of complete plugin_args dict
@pintohutch
Merge pull request #6 from nipy/master
2de8786 
Re-basing code with nipype master branch
@pintohutch
Merged resource_multiproc into s3_multiproc
6e3a7b5
@pintohutch
Merged resource_multiproc into s3_multiproc
fe0a352
@pintohutch
Merge branch 's3_multiproc' into resource_multiproc
7cc0731
@pintohutch
Re-pulled in changes from github
7b3d19f
@pintohutch
Fixed hsarc related to yrt blocking
5733af9
@pintohutch
Removed forcing of runtime_profile to be off:
544dddf
@pintohutch
Made when result is None that the end stats are N/A
c074299
@pintohutch
Added try-blocks around the runtime profile stats in callback logger
a4e3ae6
@pintohutch
Cleaned up some code and removed recursion from get_num_threads
e25ac8c
@pintohutch
Added check for runtime having 'get' attribute
d714a03
@pintohutch
Removed print statements
27ee192
@pintohutch
Removed more print statements and touched up some code to be more lik…
c99f834 
…e nipy/master
@pintohutch
Added a fix for the recursive symlink bug (was happening because whil…
07461cf 
…e loop in memory_profiler was executing node twice when it didnt finish running the first time
@pintohutch
Removed node.run level profiling
116a6a1
@pintohutch
Updated keyword in result dictionary to runtime instead of cmd-level
c1376c4
pintohutch and others added 16 commits March 17, 2016 17:04
@pintohutch
Added small docstring comment
c043685
@pintohutch
Merged in commits from @sgiavasis
b978529
@pintohutch
Merge branch 'sgiavasis-master' into new_interfaces
3f0470e
@pintohutch
Added 3dECM interface
8e88e09
@pintohutch
Merge pull request #12 from nipy/master
a80756c 
Update new_interfaces with current Nipype Master
@sgiavasis
Merge pull request #10 from FCP-INDI/new_interfaces
cc9918c 
New interfaces update into sgiavasis/nipype
@sgiavasis
3dAllineate interface out_matrix output file handling fixed.
1db5495
@pintohutch
Merge pull request #15 from sgiavasis/master
3fc3821 
3dAllineate out_matrix output file handling fix
@pintohutch
Auto-generated unit tests for new afni interfaces
d8119d3
@pintohutch
Merge pull request #20 from nipy/master
22677a7 
Re-base with nipy master
@pintohutch
Removed resource_multiproc code so only new_interfaces code is left
9f3de6d
@pintohutch
Merge branch 'new_interfaces' of https://github.com/fcp-indi/nipype i…
95d5cc3 
…nto new_interfaces
@pintohutch
Fixed unit test for s3 datasink override interface input
15a7cef
@pintohutch
Added new interfaces to __init__ import
0a5bb0b
@pintohutch
Changed doctests to use functional.nii
df8c65f
@pintohutch
Fixed commandline strings for centrality doctests
a28ed37
@coveralls
Copy link

coveralls commented Apr 28, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.04%) to 72.514% when pulling a28ed37 on FCP-INDI:new_interfaces into aeecd2f on nipy:master.

@pintohutch
Copy link
Contributor Author

We need to add a couple of corrections here. @sgiavasis and I will let you guys know when these can be fully pulled in

@chrisgorgo
Copy link
Member

Ok. Thanks for the update.

On Tue, May 10, 2016 at 3:54 PM, Daniel Clark notifications@github.com
wrote:

We need to add a couple of corrections here. @sgiavasis
https://github.com/sgiavasis and I will let you guys know when these
can be fully pulled in

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#1460 (comment)

@pintohutch
Copy link
Contributor Author

@chrisfilo - This is all patched up and ready now

@pintohutch
Copy link
Contributor Author

@chrisfilo - any thoughts on this? Does this look good to merge?

@chrisgorgo
Copy link
Member

Could you list the new interfaces in CHANGES file? Otherwise looks good.

@pintohutch
Copy link
Contributor Author

Where in CHANGES? Here? https://github.com/fcp-indi/nipype/blob/new_interfaces/CHANGES#L34

@chrisgorgo
Copy link
Member

That's the one! This way users can see what's new - it get's rendered here:
http://nipy.org/nipype/changes.html

On Tue, May 17, 2016 at 2:57 PM, Daniel Clark notifications@github.com
wrote:

Where in CHANGES? Here?
https://github.com/fcp-indi/nipype/blob/new_interfaces/CHANGES#L34

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#1460 (comment)

@coveralls
Copy link

coveralls commented May 17, 2016 •
edited
Loading

Coverage Status

Coverage decreased (-0.4%) to 72.076% when pulling bb3a5da on FCP-INDI:new_interfaces into b89294f on nipy:master.

@satra satra merged commit 2b9c5e9 into nipy:master May 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pintohutch @coveralls @chrisgorgo @satra @carolFrohlich @sgiavasis