Skip to content

FIX: Correctly connect JoinNodes in nested iterables #2597

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

Merged
merged 4 commits into from
May 26, 2018
Merged

FIX: Correctly connect JoinNodes in nested iterables #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
878a97b
DEBUG: Log dropped JoinNodes
effigies May 15, 2018
75451e4
ENH: Add debug in case the issue is in the second, more common case
effigies May 15, 2018
57c1fb6
TEST: Add nested iterables test
effigies May 25, 2018
6c9bb4d
FIX: Narrow check, update comment, remove warnings
effigies May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions nipype/pipeline/engine/tests/test_join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,3 +627,35 @@ def sq(x):
joinfield=['in1'])
wf.connect(square, 'out', square_join, "in1")
wf.run()


def test_join_nestediters(tmpdir):
tmpdir.chdir()

def exponent(x, p):
return x ** p

wf = pe.Workflow('wf', base_dir=tmpdir.strpath)

xs = pe.Node(IdentityInterface(['x']),
iterables=[('x', [1, 2])],
name='xs')
ps = pe.Node(IdentityInterface(['p']),
iterables=[('p', [3, 4])],
name='ps')
exp = pe.Node(Function(function=exponent), name='exp')
exp_joinx = pe.JoinNode(Merge(1, ravel_inputs=True),
name='exp_joinx',
joinsource='xs',
joinfield=['in1'])
exp_joinp = pe.JoinNode(Merge(1, ravel_inputs=True),
name='exp_joinp',
joinsource='ps',
joinfield=['in1'])
wf.connect([
(xs, exp, [('x', 'x')]),
(ps, exp, [('p', 'p')]),
(exp, exp_joinx, [('out', 'in1')]),
(exp_joinx, exp_joinp, [('out', 'in1')])])

wf.run()
8 changes: 5 additions & 3 deletions nipype/pipeline/engine/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,12 +1054,14 @@ def make_field_func(*pair):
for src_id in list(old_edge_dict.keys()):
# Drop the original JoinNodes; only concerned with
# generated Nodes
if hasattr(node, 'joinfield'):
if hasattr(node, 'joinfield') and node.itername == src_id:
continue
# Patterns:
# - src_id : Non-iterable node
# - src_id.[a-z]\d+ : IdentityInterface w/ iterables
# - src_id.[a-z]I.[a-z]\d+ : Non-IdentityInterface w/ iterables
# - src_id.[a-z]\d+ :
# IdentityInterface w/ iterables or nested JoinNode
# - src_id.[a-z]I.[a-z]\d+ :
# Non-IdentityInterface w/ iterables
# - src_idJ\d+ : JoinNode(IdentityInterface)
if re.match(src_id + r'((\.[a-z](I\.[a-z])?|J)\d+)?$',
node.itername):
Expand Down