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

Jump to bottom

Fix output type for LinearLayer #70

Merged
merged 1 commit into from
Sep 24, 2023
Merged

Fix output type for LinearLayer #70

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
20 changes: 13 additions & 7 deletions src/linear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,34 @@ end

LinearLayer(in_dim::Int, out_dim::Int; feature_first = false, use_cache = true) = LinearLayer{feature_first}(in_dim, out_dim, use_cache, _make_reqfields()...)

_valtype(l::LinearLayer, x::AbstractArray, ps) =
promote_type(eltype(x), eltype(ps.W))

(l::LinearLayer)(x::AbstractVector, ps, st) = begin
out = acquire!(st.pool, :A, (l.out_dim, ), eltype(x));
function (l::LinearLayer)(x::AbstractVector, ps, st)
out = acquire!(st.pool, :A, (l.out_dim, ), _valtype(l, x, ps))
mul!(unwrap(out), ps.W, unwrap(x)); release!(x);
return out, st
end

(l::LinearLayer{true})(x::AbstractMatrix, ps, st) = begin
out = acquire!(st.pool, :bA, (l.out_dim, size(x, 2)), eltype(x));
function (l::LinearLayer{true})(x::AbstractMatrix, ps, st)
out = acquire!(st.pool, :bA, (l.out_dim, size(x, 2)), _valtype(l, x, ps));
mul!(unwrap(out), ps.W, unwrap(x)); release!(x);
return out, st
end

(l::LinearLayer{false})(x::AbstractMatrix, ps, st) = begin
out = acquire!(st.pool, :bA, (size(x, 1), l.out_dim), eltype(x));
out = acquire!(st.pool, :bA, (size(x, 1), l.out_dim), _valtype(l, x, ps));
mul!(unwrap(out), unwrap(x), transpose(PtrArray(ps.W))); release!(x);
return out, st
end

# Jerry: Maybe we should use Glorot Uniform if we have no idea about what we should use?
LuxCore.initialparameters(rng::AbstractRNG, l::LinearLayer) = ( W = randn(rng, l.out_dim, l.in_dim), )
LuxCore.initialstates(rng::AbstractRNG, l::LinearLayer) = ( l.use_cache ? (pool = ArrayPool(FlexArrayCache), ) : (pool = ArrayPool(FlexArray), ))
LuxCore.initialparameters(rng::AbstractRNG, l::LinearLayer) =
( W = randn(rng, l.out_dim, l.in_dim), )

LuxCore.initialstates(rng::AbstractRNG, l::LinearLayer) =
( l.use_cache ? (pool = ArrayPool(FlexArrayCache), )
: (pool = ArrayPool(FlexArray), ))

# TODO: check whether we can do this without multiple dispatch on vec/mat without loss of performance
function rrule(::typeof(LuxCore.apply), l::LinearLayer, x::AbstractVector, ps, st)
Expand Down
Loading