Skip to content

Commit cc8646b

Browse files
tclosetclose
committed
added node names
1 parent afe64e1 commit cc8646b

File tree

1 file changed

+80
-73
lines changed

1 file changed

+80
-73
lines changed

‎pydra/engine/tests/test_workflow.py‎

Lines changed: 80 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,8 +1030,8 @@ def test_wf_3sernd_ndst_1(plugin, tmpdir):
10301030
@workflow.define
10311031
def Workflow(x, y):
10321032
mult = workflow.add(Multiply().split(["x", "y"], x=x, y=y))
1033-
add2_1st = workflow.add(Add2(x=mult.out))
1034-
add2_2nd = workflow.add(Add2(x=add2_1st.out))
1033+
add2_1st = workflow.add(Add2(x=mult.out), name="add2_1st")
1034+
add2_2nd = workflow.add(Add2(x=add2_1st.out), name="add2_2nd")
10351035
return add2_2nd.out
10361036

10371037
wf = Workflow(x=[1, 2], y=[11, 12])
@@ -1068,9 +1068,9 @@ def test_wf_3sernd_ndst_1a(plugin, tmpdir):
10681068

10691069
@workflow.define
10701070
def Workflow(x, y):
1071-
add2_1st = workflow.add(Add2().split("x", x=x))
1071+
add2_1st = workflow.add(Add2().split("x", x=x), name="add2_1st")
10721072
mult = workflow.add(Multiply(x=add2_1st.out).split("y", y=y))
1073-
add2_2nd = workflow.add(Add2(x=mult.out))
1073+
add2_2nd = workflow.add(Add2(x=mult.out), name="add2_2nd")
10741074
return add2_2nd.out
10751075

10761076
wf = Workflow(x=[1, 2], y=[11, 12])
@@ -1108,8 +1108,8 @@ def test_wf_3nd_st_1(plugin_dask_opt, tmpdir):
11081108

11091109
@workflow.define
11101110
def Workflow(x, y):
1111-
add2x = workflow.add(Add2(x=x))
1112-
add2y = workflow.add(Add2(x=y))
1111+
add2x = workflow.add(Add2(x=x), name="add2x")
1112+
add2y = workflow.add(Add2(x=y), name="add2y")
11131113
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
11141114

11151115
return mult.out
@@ -1135,8 +1135,8 @@ def test_wf_3nd_ndst_1(plugin_dask_opt, tmpdir):
11351135

11361136
@workflow.define
11371137
def Workflow(x, y):
1138-
add2x = workflow.add(Add2().split("x", x=x))
1139-
add2y = workflow.add(Add2().split("x", x=y))
1138+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1139+
add2y = workflow.add(Add2().split("x", x=y), name="add2y")
11401140
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
11411141
return mult.out
11421142

@@ -1158,8 +1158,8 @@ def test_wf_3nd_st_2(plugin, tmpdir):
11581158

11591159
@workflow.define
11601160
def Workflow(x, y):
1161-
add2x = workflow.add(Add2(x=x))
1162-
add2y = workflow.add(Add2(x=y))
1161+
add2x = workflow.add(Add2(x=x), name="add2x")
1162+
add2y = workflow.add(Add2(x=y), name="add2y")
11631163
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
11641164
return mult.out
11651165

@@ -1210,8 +1210,8 @@ def test_wf_3nd_st_3(plugin, tmpdir):
12101210

12111211
@workflow.define
12121212
def Workflow(x, y):
1213-
add2x = workflow.add(Add2(x=x))
1214-
add2y = workflow.add(Add2(x=y))
1213+
add2x = workflow.add(Add2(x=x), name="add2x")
1214+
add2y = workflow.add(Add2(x=y), name="add2y")
12151215
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
12161216
return mult.out
12171217

@@ -1238,8 +1238,8 @@ def test_wf_3nd_ndst_3(plugin, tmpdir):
12381238

12391239
@workflow.define
12401240
def Workflow(x, y):
1241-
add2x = workflow.add(Add2().split("x", x=x))
1242-
add2y = workflow.add(Add2().split("x", x=y))
1241+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1242+
add2y = workflow.add(Add2().split("x", x=y), name="add2y")
12431243
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out).combine("add2y.x"))
12441244
return mult.out
12451245

@@ -1263,8 +1263,8 @@ def test_wf_3nd_st_4(plugin, tmpdir):
12631263

12641264
@workflow.define
12651265
def Workflow(x, y):
1266-
add2x = workflow.add(Add2(x=x))
1267-
add2y = workflow.add(Add2(x=y))
1266+
add2x = workflow.add(Add2(x=x), name="add2x")
1267+
add2y = workflow.add(Add2(x=y), name="add2y")
12681268
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
12691269
return mult.out
12701270

@@ -1291,8 +1291,8 @@ def test_wf_3nd_ndst_4(plugin, tmpdir):
12911291

12921292
@workflow.define
12931293
def Workflow(x, y):
1294-
add2x = workflow.add(Add2().split("x", x=x))
1295-
add2y = workflow.add(Add2().split("x", x=y))
1294+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1295+
add2y = workflow.add(Add2().split("x", x=y), name="add2y")
12961296
mult = workflow.add(
12971297
Multiply(x=add2x.out, y=add2y.out).combine(["add2x.x", "add2y.x"])
12981298
)
@@ -1317,8 +1317,8 @@ def test_wf_3nd_st_5(plugin, tmpdir):
13171317

13181318
@workflow.define
13191319
def Workflow(x, y, z):
1320-
add2x = workflow.add(Add2(x=x))
1321-
add2y = workflow.add(Add2(x=y))
1320+
add2x = workflow.add(Add2(x=x), name="add2x")
1321+
add2y = workflow.add(Add2(x=y), name="add2y")
13221322
addvar = workflow.add(FunAddVar3(a=add2x.out, b=add2y.out, c=z))
13231323
return addvar.out
13241324

@@ -1347,8 +1347,8 @@ def test_wf_3nd_ndst_5(plugin, tmpdir):
13471347

13481348
@workflow.define
13491349
def Workflow(x, y, z):
1350-
add2x = workflow.add(Add2().split("x", x=x))
1351-
add2y = workflow.add(Add2().split("x", x=y))
1350+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1351+
add2y = workflow.add(Add2().split("x", x=y), name="add2y")
13521352
addvar = workflow.add(
13531353
FunAddVar3(a=add2x.out, b=add2y.out).split("c", c=z).combine("add2x.x")
13541354
)
@@ -1378,8 +1378,8 @@ def test_wf_3nd_ndst_6(plugin, tmpdir):
13781378

13791379
@workflow.define
13801380
def Workflow(x, y):
1381-
add2x = workflow.add(Add2().split("x", x=x))
1382-
add2y = workflow.add(Add2().split("x", x=y))
1381+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1382+
add2y = workflow.add(Add2().split("x", x=y), name="add2y")
13831383
mult = workflow.add(
13841384
Multiply(x=add2x.out, y=add2y.out)
13851385
.split(("_add2x", "_add2y"))
@@ -1404,8 +1404,8 @@ def test_wf_3nd_ndst_7(plugin, tmpdir):
14041404

14051405
@workflow.define
14061406
def Workflow(x):
1407-
add2x = workflow.add(Add2().split("x", x=x))
1408-
add2y = workflow.add(Add2().split("x", x=x))
1407+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1408+
add2y = workflow.add(Add2().split("x", x=x), name="add2y")
14091409
mult = workflow.add(
14101410
Multiply(x=add2x.out, y=add2y.out).split(("_add2x", "_add2y"))
14111411
)
@@ -1430,11 +1430,15 @@ def test_wf_3nd_8(tmpdir):
14301430
@workflow.define(outputs=["out1", "out2", "out1a", "out2a"])
14311431
def Workflow(zip):
14321432

1433-
iden2flds_1 = workflow.add(Identity2Flds(x2="Hoi").split("x1", x1=zip))
1433+
iden2flds_1 = workflow.add(
1434+
Identity2Flds(x2="Hoi").split("x1", x1=zip), name="iden2flds_1"
1435+
)
14341436

14351437
identity = workflow.add(Identity(x=iden2flds_1.out1))
14361438

1437-
iden2flds_2 = workflow.add(Identity2Flds(x1=identity.out, x2=iden2flds_1.out2))
1439+
iden2flds_2 = workflow.add(
1440+
Identity2Flds(x1=identity.out, x2=iden2flds_1.out2), name="iden2flds_2"
1441+
)
14381442

14391443
iden2flds_2a = workflow.add(
14401444
Identity2Flds(
@@ -1846,8 +1850,8 @@ def test_wf_st_singl_2(plugin, tmpdir):
18461850

18471851
@workflow.define
18481852
def Workflow(x, y):
1849-
add2x = workflow.add(Add2(x=x))
1850-
add2y = workflow.add(Add2(x=y))
1853+
add2x = workflow.add(Add2(x=x), name="add2x")
1854+
add2y = workflow.add(Add2(x=y), name="add2y")
18511855
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
18521856
return mult.out
18531857

@@ -1872,8 +1876,8 @@ def test_wf_ndst_singl_2(plugin, tmpdir):
18721876

18731877
@workflow.define
18741878
def Workflow(x, y):
1875-
add2x = workflow.add(Add2().split("x", x=x))
1876-
add2y = workflow.add(Add2(x=y))
1879+
add2x = workflow.add(Add2().split("x", x=x), name="add2x")
1880+
add2y = workflow.add(Add2(x=y), name="add2y")
18771881
mult = workflow.add(Multiply(x=add2x.out, y=add2y.out))
18781882
return mult.out
18791883

@@ -2285,8 +2289,8 @@ def test_wfasnd_4(plugin, tmpdir):
22852289

22862290
@workflow.define
22872291
def Wfnd(x):
2288-
add2_1st = workflow.add(Add2(x=x))
2289-
add2_2nd = workflow.add(Add2(x=add2_1st.out))
2292+
add2_1st = workflow.add(Add2(x=x), name="add2_1st")
2293+
add2_2nd = workflow.add(Add2(x=add2_1st.out), name="add2_2nd")
22902294
return add2_2nd.out
22912295

22922296
@workflow.define
@@ -2312,8 +2316,8 @@ def test_wfasnd_ndst_4(plugin, tmpdir):
23122316

23132317
@workflow.define
23142318
def Wfnd(x):
2315-
add2_1st = workflow.add(Add2().split(x=x))
2316-
add2_2nd = workflow.add(Add2(x=add2_1st.out))
2319+
add2_1st = workflow.add(Add2().split(x=x), name="add2_1st")
2320+
add2_2nd = workflow.add(Add2(x=add2_1st.out), name="add2_2nd")
23172321
return add2_2nd.out
23182322

23192323
@workflow.define
@@ -2339,8 +2343,8 @@ def test_wfasnd_wfst_4(plugin, tmpdir):
23392343

23402344
@workflow.define
23412345
def Wfnd(x):
2342-
add2_1st = workflow.add(Add2(x=x))
2343-
add2_2nd = workflow.add(Add2(x=add2_1st.out))
2346+
add2_1st = workflow.add(Add2(x=x), name="add2_1st")
2347+
add2_2nd = workflow.add(Add2(x=add2_1st.out), name="add2_2nd")
23442348
return add2_2nd.out
23452349

23462350
@workflow.define
@@ -3769,8 +3773,12 @@ def test_workflow_combine1(tmpdir):
37693773
@workflow.define(outputs=["out_pow", "out_iden1", "out_iden2"])
37703774
def Workflow1(a, b):
37713775
power = workflow.add(Power().split(["a", "b"], a=a, b=b))
3772-
identity1 = workflow.add(Identity(x=power.out).combine("power.a"))
3773-
identity2 = workflow.add(Identity(x=identity1.out).combine("power.b"))
3776+
identity1 = workflow.add(
3777+
Identity(x=power.out).combine("power.a"), name="identity1"
3778+
)
3779+
identity2 = workflow.add(
3780+
Identity(x=identity1.out).combine("power.b"), name="identity2"
3781+
)
37743782
return power.out, identity1.out, identity2.out
37753783

37763784
wf1 = Workflow1(a=[1, 2], b=[2, 3])
@@ -4027,9 +4035,8 @@ def test_wf_upstream_error1(plugin, tmpdir):
40274035

40284036
@workflow.define
40294037
def Workflow(x):
4030-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4031-
4032-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4038+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
4039+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
40334040
return addvar2.out
40344041

40354042
wf = Workflow(x="hi") # TypeError for adding str and int
@@ -4048,9 +4055,9 @@ def test_wf_upstream_error2(plugin, tmpdir):
40484055

40494056
@workflow.define
40504057
def Workflow(x):
4051-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4058+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
40524059

4053-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4060+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
40544061
return addvar2.out
40554062

40564063
wf = Workflow().split(
@@ -4072,9 +4079,9 @@ def test_wf_upstream_error3(plugin, tmpdir):
40724079

40734080
@workflow.define
40744081
def Workflow(x):
4075-
addvar1 = workflow.add(FunAddVarDefaultNoType().split("a", a=x))
4082+
addvar1 = workflow.add(FunAddVarDefaultNoType().split("a", a=x), name="addvar1")
40764083

4077-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4084+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
40784085
return addvar2.out
40794086

40804087
wf = Workflow(x=[1, "hi"]) # TypeError for adding str and int
@@ -4130,8 +4137,8 @@ def test_wf_upstream_error6(plugin, tmpdir):
41304137

41314138
@workflow.define
41324139
def Workflow(x):
4133-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4134-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4140+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
4141+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
41354142

41364143
return addvar2.out # wf_out
41374144

@@ -4158,10 +4165,10 @@ def test_wf_upstream_error7(plugin, tmpdir):
41584165

41594166
@workflow.define
41604167
def Workflow(x):
4161-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4168+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
41624169

4163-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4164-
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out))
4170+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
4171+
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out), name="addvar3")
41654172
return addvar3.out
41664173

41674174
wf = Workflow(x="hi") # TypeError for adding str and int
@@ -4183,10 +4190,10 @@ def test_wf_upstream_error7a(plugin, tmpdir):
41834190

41844191
@workflow.define
41854192
def Workflow(x):
4186-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4193+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
41874194

4188-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4189-
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out))
4195+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
4196+
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out), name="addvar3")
41904197
return addvar3.out
41914198

41924199
wf = Workflow(x="hi") # TypeError for adding str and int
@@ -4207,10 +4214,10 @@ def test_wf_upstream_error7b(plugin, tmpdir):
42074214

42084215
@workflow.define(outputs=["out1", "out2"])
42094216
def Workflow(x):
4210-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4217+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
42114218

4212-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4213-
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out))
4219+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
4220+
addvar3 = workflow.add(FunAddVarDefaultNoType(a=addvar2.out), name="addvar3")
42144221
return addvar2.out, addvar3.out #
42154222

42164223
wf = Workflow(x="hi") # TypeError for adding str and int
@@ -4228,9 +4235,9 @@ def test_wf_upstream_error8(plugin, tmpdir):
42284235

42294236
@workflow.define(outputs=["out1", "out2"])
42304237
def Workflow(x):
4231-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4238+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
42324239

4233-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out))
4240+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addvar1.out), name="addvar2")
42344241
addtwo = workflow.add(FunAddTwo(a=addvar1.out))
42354242
return addvar2.out, addtwo.out #
42364243

@@ -4254,12 +4261,12 @@ def test_wf_upstream_error9(plugin, tmpdir):
42544261

42554262
@workflow.define
42564263
def Workflow(x):
4257-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4264+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
42584265

4259-
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"))
4260-
follow_err = workflow.add(FunAddVarDefaultNoType(a=err.out))
4266+
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"), name="err")
4267+
follow_err = workflow.add(FunAddVarDefaultNoType(a=err.out), name="follow_err")
42614268

4262-
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out))
4269+
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out), name="addtwo")
42634270
workflow.add(FunAddVarDefaultNoType(a=addtwo.out))
42644271
return follow_err.out # out1
42654272

@@ -4283,13 +4290,13 @@ def test_wf_upstream_error9a(plugin, tmpdir):
42834290

42844291
@workflow.define
42854292
def Workflow(x):
4286-
addvar1 = workflow.add(FunAddVarDefault(a=x))
4293+
addvar1 = workflow.add(FunAddVarDefault(a=x), name="addvar1")
42874294

4288-
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"))
4295+
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"), name="err")
42894296
workflow.add(FunAddVarDefault(a=err.out))
42904297

4291-
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out))
4292-
addvar2 = workflow.add(FunAddVarDefault(a=addtwo.out))
4298+
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out), name="addtwo")
4299+
addvar2 = workflow.add(FunAddVarDefault(a=addtwo.out), name="addvar2")
42934300
return addvar2.out # out1 # , ("out2", addtwo.out)])
42944301

42954302
wf = Workflow(x=2)
@@ -4309,13 +4316,13 @@ def test_wf_upstream_error9b(plugin, tmpdir):
43094316

43104317
@workflow.define(outputs=["out1", "out2"])
43114318
def Workflow(x):
4312-
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x))
4319+
addvar1 = workflow.add(FunAddVarDefaultNoType(a=x), name="addvar1")
43134320

4314-
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"))
4315-
follow_err = workflow.add(FunAddVarDefaultNoType(a=err.out))
4321+
err = workflow.add(FunAddVarNoType(a=addvar1.out, b="hi"), name="err")
4322+
follow_err = workflow.add(FunAddVarDefaultNoType(a=err.out), name="follow_err")
43164323

4317-
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out))
4318-
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addtwo.out))
4324+
addtwo = workflow.add(FunAddTwoNoType(a=addvar1.out), name="addtwo")
4325+
addvar2 = workflow.add(FunAddVarDefaultNoType(a=addtwo.out), name="addvar2")
43194326
return follow_err.out, addvar2.out
43204327

43214328
wf = Workflow(x=2)

0 commit comments

Comments
 (0)