Skip to content
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

Fix |> gpu bug in @autosize #2085

Merged
merged 1 commit into from
Oct 15, 2022
Merged

Fix |> gpu bug in @autosize #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/outputsize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ julia> @autosize (img..., 1, 32) Chain( # size is only needed at ru
Dense(_ => _÷4, relu, init=Flux.rand32), # can calculate output size _÷4
SkipConnection(Dense(_ => _, relu), +),
Dense(_ => 10),
) |> gpu # moves to GPU after initialisation
)
Chain(
Chain(
c = Conv((3, 3), 1 => 5, pad=1, stride=2), # 50 parameters
Expand Down Expand Up @@ -290,8 +290,6 @@ mutable struct LazyLayer
layer
end

@functor LazyLayer

function (l::LazyLayer)(x::AbstractArray, ys::AbstractArray...)
l.layer === nothing || return l.layer(x, ys...)
made = l.make(x) # for something like `Bilinear((_,__) => 7)`, perhaps need `make(xy...)`, later.
Expand Down Expand Up @@ -320,6 +318,9 @@ function ChainRulesCore.rrule(::typeof(striplazy), m)
end

params!(p::Params, x::LazyLayer, seen = IdSet()) = error("LazyLayer should never be used within params(m). Call striplazy(m) first.")

Functors.functor(::Type{<:LazyLayer}, x) = error("LazyLayer should not be walked with Functors.jl, as the arrays which Flux.gpu wants to move may not exist yet.")

function Base.show(io::IO, l::LazyLayer)
printstyled(io, "LazyLayer(", color=:light_black)
if l.layer == nothing
Expand Down
7 changes: 5 additions & 2 deletions test/outputsize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ end
Dense(_ => _÷4, relu, init=Flux.rand32), # can calculate output size _÷4
SkipConnection(Dense(_ => _, relu), +),
Dense(_ => 10),
) |> gpu # moves to GPU after initialisation
@test randn(Float32, img..., 1, 32) |> gpu |> m |> size == (10, 32)
)
@test randn(Float32, img..., 1, 32) |> m |> size == (10, 32)
end

@testset "LazyLayer" begin
Expand All @@ -241,4 +241,7 @@ end
@test_throws Exception Flux.params(lm)
@test_throws Exception gradient(x -> sum(abs2, lm(x)), [1,2])
@test_throws Exception gradient(m -> sum(abs2, Flux.striplazy(m)([1,2])), ld)

# Can't let |> gpu act before the arrays are materialized... so it's an error:
@test_throws ErrorException @eval @autosize (1,2,3) Dense(_=>2) |> f64
end