Skip to content

Commit 21cf47c

Browse files
yuehhuayuehhua
committed
fix tests
1 parent da4de21 commit 21cf47c

File tree

5 files changed

+38
-39
lines changed

5 files changed

+38
-39
lines changed

‎test/cuda/conv.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
fg_ = gc(fg)
2525
@test size(node_feature(fg_)) == (out_channel, N)
2626

27-
g = Zygote.gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
27+
g = gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
2828
@test length(g.grads) == 4
2929
end
3030

@@ -33,7 +33,7 @@
3333
Y = gc(X |> gpu)
3434
@test size(Y) == (out_channel, N)
3535

36-
g = Zygote.gradient(() -> sum(gc(X |> gpu)), Flux.params(gc))
36+
g = gradient(() -> sum(gc(X |> gpu)), Flux.params(gc))
3737
@test length(g.grads) == 3
3838
end
3939
end
@@ -53,7 +53,7 @@
5353
fg_ = cc(fg)
5454
@test size(node_feature(fg_)) == (out_channel, N)
5555

56-
g = Zygote.gradient(() -> sum(node_feature(cc(fg))), Flux.params(cc))
56+
g = gradient(() -> sum(node_feature(cc(fg))), Flux.params(cc))
5757
@test length(g.grads) == 4
5858
end
5959

@@ -62,7 +62,7 @@
6262
Y = cc(X |> gpu)
6363
@test size(Y) == (out_channel, N)
6464

65-
g = Zygote.gradient(() -> sum(cc(X |> gpu)), Flux.params(cc))
65+
g = gradient(() -> sum(cc(X |> gpu)), Flux.params(cc))
6666
@test length(g.grads) == 3
6767
end
6868
end
@@ -79,7 +79,7 @@
7979
fg_ = gc(fg)
8080
@test size(node_feature(fg_)) == (out_channel, N)
8181

82-
g = Zygote.gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
82+
g = gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
8383
@test length(g.grads) == 5
8484
end
8585

@@ -89,7 +89,7 @@
8989
Y = gc(X |> gpu)
9090
@test size(Y) == (out_channel, N, batch_size)
9191

92-
g = Zygote.gradient(() -> sum(gc(X |> gpu)), Flux.params(gc))
92+
g = gradient(() -> sum(gc(X |> gpu)), Flux.params(gc))
9393
@test length(g.grads) == 4
9494
end
9595
end
@@ -112,7 +112,7 @@
112112
fg_ = gat(fg)
113113
@test size(node_feature(fg_)) == (out_channel * heads, N)
114114

115-
g = Zygote.gradient(() -> sum(node_feature(gat(fg))), Flux.params(gat))
115+
g = gradient(() -> sum(node_feature(gat(fg))), Flux.params(gat))
116116
@test length(g.grads) == 5
117117
end
118118

@@ -122,7 +122,7 @@
122122
Y = gat(X |> gpu)
123123
@test size(Y) == (out_channel * heads, N, batch_size)
124124

125-
g = Zygote.gradient(() -> sum(gat(X |> gpu)), Flux.params(gat))
125+
g = gradient(() -> sum(gat(X |> gpu)), Flux.params(gat))
126126
@test length(g.grads) == 4
127127
end
128128
end
@@ -138,7 +138,7 @@
138138
fg_ = ggc(fg)
139139
@test size(node_feature(fg_)) == (out_channel, N)
140140

141-
g = Zygote.gradient(() -> sum(node_feature(ggc(fg))), Flux.params(ggc))
141+
g = gradient(() -> sum(node_feature(ggc(fg))), Flux.params(ggc))
142142
@test length(g.grads) == 8
143143
end
144144

@@ -148,7 +148,7 @@
148148
@test_broken Y = ggc(X |> gpu)
149149
@test_broken size(Y) == (out_channel, N, batch_size)
150150

151-
@test_broken g = Zygote.gradient(() -> sum(ggc(X |> gpu)), Flux.params(ggc))
151+
@test_broken g = gradient(() -> sum(ggc(X |> gpu)), Flux.params(ggc))
152152
@test_broken length(g.grads) == 6
153153
end
154154
end
@@ -162,7 +162,7 @@
162162
fg_ = ec(fg)
163163
@test size(node_feature(fg_)) == (out_channel, N)
164164

165-
g = Zygote.gradient(() -> sum(node_feature(ec(fg))), Flux.params(ec))
165+
g = gradient(() -> sum(node_feature(ec(fg))), Flux.params(ec))
166166
@test length(g.grads) == 4
167167
end
168168

@@ -172,7 +172,7 @@
172172
Y = ec(X |> gpu)
173173
@test size(Y) == (out_channel, N, batch_size)
174174

175-
g = Zygote.gradient(() -> sum(ec(X |> gpu)), Flux.params(ec))
175+
g = gradient(() -> sum(ec(X |> gpu)), Flux.params(ec))
176176
@test length(g.grads) == 3
177177
end
178178
end

‎test/cuda/msgpass.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
fg_ = l(fg)
4545
@test size(node_feature(fg_)) == (out_channel, N)
4646

47-
g = Zygote.gradient(() -> sum(node_feature(l(fg))), Flux.params(l))
47+
g = gradient(() -> sum(node_feature(l(fg))), Flux.params(l))
4848
@test length(g.grads) == 3
4949
end
5050

@@ -56,7 +56,7 @@
5656
Y = l(X |> gpu)
5757
@test size(Y) == (out_channel, N, batch_size)
5858

59-
g = Zygote.gradient(() -> sum(l(X |> gpu)), Flux.params(l))
59+
g = gradient(() -> sum(l(X |> gpu)), Flux.params(l))
6060
@test length(g.grads) == 2
6161
end
6262
end

‎test/layers/conv.jl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
fgt_ = gc(fgt)
3333
@test size(node_feature(fgt_)) == (out_channel, N)
3434

35-
g = Zygote.gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
35+
g = gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
3636
@test length(g.grads) == 4
3737
end
3838

@@ -45,7 +45,7 @@
4545
Y = gc(Xt)
4646
@test size(Y) == (out_channel, N)
4747

48-
g = Zygote.gradient(() -> sum(gc(X)), Flux.params(gc))
48+
g = gradient(() -> sum(gc(X)), Flux.params(gc))
4949
@test length(g.grads) == 3
5050
end
5151

@@ -85,7 +85,7 @@
8585
fgt_ = cc(fgt)
8686
@test size(node_feature(fgt_)) == (out_channel, N)
8787

88-
g = Zygote.gradient(() -> sum(node_feature(cc(fg))), Flux.params(cc))
88+
g = gradient(() -> sum(node_feature(cc(fg))), Flux.params(cc))
8989
@test length(g.grads) == 4
9090
end
9191

@@ -98,7 +98,7 @@
9898
Y = cc(Xt)
9999
@test size(Y) == (out_channel, N)
100100

101-
g = Zygote.gradient(() -> sum(cc(X)), Flux.params(cc))
101+
g = gradient(() -> sum(cc(X)), Flux.params(cc))
102102
@test length(g.grads) == 2
103103
end
104104

@@ -121,7 +121,7 @@
121121
@test size(node_feature(fg_)) == (out_channel, N)
122122
@test_throws MethodError gc(X)
123123

124-
g = Zygote.gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
124+
g = gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
125125
@test length(g.grads) == 5
126126
end
127127

@@ -131,7 +131,7 @@
131131
Y = gc(X)
132132
@test size(Y) == (out_channel, N, batch_size)
133133

134-
g = Zygote.gradient(() -> sum(gc(X)), Flux.params(gc))
134+
g = gradient(() -> sum(gc(X)), Flux.params(gc))
135135
@test length(g.grads) == 3
136136
end
137137

@@ -168,7 +168,7 @@
168168
@test size(node_feature(fg_)) == (concat ? (out_channel * heads, N) : (out_channel, N))
169169
@test_throws MethodError gat(X)
170170

171-
g = Zygote.gradient(() -> sum(node_feature(gat(fg_gat))), Flux.params(gat))
171+
g = gradient(() -> sum(node_feature(gat(fg_gat))), Flux.params(gat))
172172
@test length(g.grads) == 5
173173
end
174174
end
@@ -181,7 +181,7 @@
181181
Y = gat(X)
182182
@test size(Y) == (concat ? (out_channel * heads, N, batch_size) : (out_channel, N, batch_size))
183183

184-
g = Zygote.gradient(() -> sum(gat(X)), Flux.params(gat))
184+
g = gradient(() -> sum(gat(X)), Flux.params(gat))
185185
@test length(g.grads) == 3
186186
end
187187
end
@@ -221,7 +221,7 @@
221221
@test size(node_feature(fg_)) == (concat ? (out_channel * heads, N) : (out_channel, N))
222222
@test_throws MethodError gat2(X)
223223

224-
g = Zygote.gradient(() -> sum(node_feature(gat2(fg_gat))), Flux.params(gat2))
224+
g = gradient(() -> sum(node_feature(gat2(fg_gat))), Flux.params(gat2))
225225
@test length(g.grads) == 7
226226
end
227227
end
@@ -234,7 +234,7 @@
234234
Y = gat2(X)
235235
@test size(Y) == (concat ? (out_channel * heads, N, batch_size) : (out_channel, N, batch_size))
236236

237-
g = Zygote.gradient(() -> sum(gat2(X)), Flux.params(gat2))
237+
g = gradient(() -> sum(gat2(X)), Flux.params(gat2))
238238
@test length(g.grads) == 5
239239
end
240240
end
@@ -258,7 +258,7 @@
258258
@test size(node_feature(fg_)) == (out_channel, N)
259259
@test_throws MethodError ggc(X)
260260

261-
g = Zygote.gradient(() -> sum(node_feature(ggc(fg))), Flux.params(ggc))
261+
g = gradient(() -> sum(node_feature(ggc(fg))), Flux.params(ggc))
262262
@test length(g.grads) == 8
263263
end
264264

@@ -268,7 +268,7 @@
268268
@test_broken Y = ggc(X)
269269
@test_broken size(Y) == (out_channel, N, batch_size)
270270

271-
@test_broken g = Zygote.gradient(() -> sum(ggc(X)), Flux.params(ggc))
271+
@test_broken g = gradient(() -> sum(ggc(X)), Flux.params(ggc))
272272
@test_broken length(g.grads) == 6
273273
end
274274
end
@@ -283,7 +283,7 @@
283283
@test size(node_feature(fg_)) == (out_channel, N)
284284
@test_throws MethodError ec(X)
285285

286-
g = Zygote.gradient(() -> sum(node_feature(ec(fg))), Flux.params(ec))
286+
g = gradient(() -> sum(node_feature(ec(fg))), Flux.params(ec))
287287
@test length(g.grads) == 4
288288
end
289289

@@ -293,7 +293,7 @@
293293
Y = ec(X)
294294
@test size(Y) == (out_channel, N, batch_size)
295295

296-
g = Zygote.gradient(() -> sum(ec(X)), Flux.params(ec))
296+
g = gradient(() -> sum(ec(X)), Flux.params(ec))
297297
@test length(g.grads) == 2
298298
end
299299

@@ -303,7 +303,7 @@
303303
Y = ec(X)
304304
@test size(Y) == (out_channel, N)
305305

306-
g = Zygote.gradient(() -> sum(ec(X)), Flux.params(ec))
306+
g = gradient(() -> sum(ec(X)), Flux.params(ec))
307307
@test length(g.grads) == 2
308308
end
309309

@@ -313,7 +313,7 @@
313313
Y = ec(X)
314314
@test size(Y) == (out_channel, N, batch_size)
315315

316-
g = Zygote.gradient(() -> sum(ec(X)), Flux.params(ec))
316+
g = gradient(() -> sum(ec(X)), Flux.params(ec))
317317
@test length(g.grads) == 2
318318
end
319319
end
@@ -333,7 +333,7 @@
333333
@test size(node_feature(fg_)) == (out_channel, N)
334334
@test_throws MethodError gc(X)
335335

336-
g = Zygote.gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
336+
g = gradient(() -> sum(node_feature(gc(fg))), Flux.params(gc))
337337
@test length(g.grads) == 5
338338
end
339339

@@ -343,7 +343,7 @@
343343
Y = gc(X)
344344
@test size(Y) == (out_channel, N, batch_size)
345345

346-
g = Zygote.gradient(() -> sum(gc(X)), Flux.params(gc))
346+
g = gradient(() -> sum(gc(X)), Flux.params(gc))
347347
@test length(g.grads) == 2
348348
end
349349
end
@@ -362,7 +362,7 @@
362362
fg_ = cgc(fg)
363363
@test_throws MethodError cgc(nf)
364364

365-
g = Zygote.gradient(() -> sum(node_feature(cgc(fg))), Flux.params(cgc))
365+
g = gradient(() -> sum(node_feature(cgc(fg))), Flux.params(cgc))
366366
@test length(g.grads) == 6
367367
end
368368

@@ -373,7 +373,7 @@
373373
Y = cgc(nf, ef)
374374
@test size(Y) == (in_channel, N, batch_size)
375375

376-
g = Zygote.gradient(() -> sum(cgc(nf, ef)), Flux.params(cgc))
376+
g = gradient(() -> sum(cgc(nf, ef)), Flux.params(cgc))
377377
@test length(g.grads) == 4
378378
end
379379
end
@@ -391,7 +391,7 @@
391391
@test size(node_feature(fg_)) == (out_channel, N)
392392
@test_throws MethodError l(X)
393393

394-
g = Zygote.gradient(() -> sum(node_feature(l(fg))), Flux.params(l))
394+
g = gradient(() -> sum(node_feature(l(fg))), Flux.params(l))
395395
if l.proj == identity
396396
if conv == LSTMAggregator
397397
@test length(g.grads) == 10
@@ -414,7 +414,7 @@
414414
Y = l(X)
415415
@test size(Y) == (out_channel, N, batch_size)
416416

417-
g = Zygote.gradient(() -> sum(l(X)), Flux.params(l))
417+
g = gradient(() -> sum(l(X)), Flux.params(l))
418418
if l.layer.proj == identity
419419
@test length(g.grads) == 3
420420
else

‎test/models.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
fg_ = deepset(fg)
7474
@test size(global_feature(fg_)) == (4, 1)
7575

76-
g = Zygote.gradient(() -> sum(global_feature(deepset(fg))), Flux.params(deepset))
76+
g = gradient(() -> sum(global_feature(deepset(fg))), Flux.params(deepset))
7777
@test length(g.grads) == 6
7878
end
7979

@@ -83,7 +83,7 @@
8383
Y = deepset(X)
8484
@test size(Y) == (4, 1, batch_size)
8585

86-
g = Zygote.gradient(() -> sum(deepset(X)), Flux.params(deepset))
86+
g = gradient(() -> sum(deepset(X)), Flux.params(deepset))
8787
@test length(g.grads) == 4
8888
end
8989
end

‎test/runtests.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ using LinearAlgebra
1111
using NNlib, NNlibCUDA
1212
using SparseArrays: SparseMatrixCSC
1313
using Statistics: mean
14-
using Zygote
1514
using Test
1615

1716
cuda_tests = [

0 commit comments

Comments
 (0)