Skip to content

Commit d40e282

Browse files
Apply suggestions from code review
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a05ebb2 commit d40e282

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/rulesets/Base/base.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,24 +292,20 @@ function rrule(config::RuleConfig{>:HasReverseMode}, ::typeof(task_local_storage
292292
return y, task_local_storage_pullback
293293
end
294294

295-
296295
####
297296
#### merge
298297
####
299298

300-
function rrule(::typeof(merge), nt1::NamedTuple{F1}, nt2::NamedTuple{F2}) where {F1, F2}
299+
function rrule(::typeof(merge), nt1::NamedTuple{F1}, nt2::NamedTuple{F2}) where {F1,F2}
301300
y = merge(nt1, nt2)
302301
function merge_pullback(dy)
303302
dnt1 = Tangent{typeof(nt1)}(;
304303
(f1 => (f1 in F2 ? ZeroTangent() : getproperty(dy, f1)) for f1 in F1)...
305304
)
306-
dnt2 = Tangent{typeof(nt2)}(;
307-
(f2 => getproperty(dy, f2) for f2 in F2)...
308-
)
305+
dnt2 = Tangent{typeof(nt2)}(; (f2 => getproperty(dy, f2) for f2 in F2)...)
309306
return (NoTangent(), dnt1, dnt2)
310307
end
311308
merge_pullback(dy::AbstractThunk) = merge_pullback(unthunk(dy))
312309
merge_pullback(x::AbstractZero) = (NoTangent(), x, x)
313-
314310
return y, merge_pullback
315311
end

test/rulesets/Base/base.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ end
259259
end
260260

261261
@testset "merge NamedTuple" begin
262-
test_rrule(merge, (;a=1.0), (;b=2.0), check_inferred=false)
263-
test_rrule(merge, (;a=1.0), (;a=2.0), check_inferred=false)
262+
test_rrule(merge, (; a=1.0), (; b=2.0); check_inferred=false)
263+
test_rrule(merge, (; a=1.0), (; a=2.0); check_inferred=false)
264264
end
265265
end

0 commit comments

Comments
 (0)