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 planar error #414

Merged
merged 4 commits into from
May 14, 2024
+9 −10
Merged

fix planar error #414

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb7b747
fix planar error
prbzrg May 14, 2024
2fbd26e
fix ambiguity
prbzrg May 14, 2024
cfb6c13
try new
prbzrg May 14, 2024
539be3c
fix
prbzrg May 14, 2024
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
3 changes: 2 additions & 1 deletion src/ContinuousNormalizingFlows.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ export construct,
PlanarLayer,
MulLayer

include(joinpath("layers", "base_layer.jl"))
include(joinpath("layers", "cond_layer.jl"))
include(joinpath("layers", "planar_layer.jl"))
include(joinpath("layers", "mul_layer.jl"))
include(joinpath("layers", "planar_layer.jl"))

include("types.jl")

Expand Down
11 changes: 11 additions & 0 deletions src/layers/base_layer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@inline function apply_act(::typeof(identity), x::Any)
x

Check warning on line 2 in src/layers/base_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/base_layer.jl#L1-L2 

Added lines #L1 - L2 were not covered by tests
end

@inline function apply_act(activation::Any, x::Number)
activation(x)
end

@inline function apply_act(activation::Any, x::AbstractArray)
activation.(x)
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
@inline function apply_act(::typeof(identity), x::Any)
x
end
@inline function apply_act(activation::Any, x::Number)
activation(x)
end
@inline function apply_act(activation::Any, x::AbstractArray)
activation.(x)
end
@inline function apply_act(::typeof(identity), x::Any)
x
end
@inline function apply_act(activation::Any, x::Number)
activation(x)
end
@inline function apply_act(activation::Any, x::AbstractArray)
activation.(x)
end

2 changes: 1 addition & 1 deletion src/layers/mul_layer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
end

@inline function (m::MulLayer)(x::AbstractVecOrMat, ps::Any, st::NamedTuple)
return Lux.apply_activation(m.activation, Octavian.matmul(ps.weight, x)), st
apply_act(m.activation, Octavian.matmul(ps.weight, x)), st

Check warning on line 34 in src/layers/mul_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/mul_layer.jl#L34 

Added line #L34 was not covered by tests
end
17 changes: 8 additions & 9 deletions src/layers/planar_layer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,34 +71,33 @@
end

@inline function (m::PlanarLayer{true})(z::AbstractVector, ps::Any, st::NamedTuple)
ps.u * Lux.apply_bias_activation(m.activation, LinearAlgebra.dot(ps.w, z), only(ps.b)),
st
ps.u * apply_act(m.activation, LinearAlgebra.dot(ps.w, z) + only(ps.b)), st
end

@inline function (m::PlanarLayer{true})(z::AbstractMatrix, ps::Any, st::NamedTuple)
ps.u * Lux.apply_bias_activation(m.activation, transpose(ps.w) * z, only(ps.b)), st
ps.u * apply_act(m.activation, muladd(transpose(ps.w), z, only(ps.b))), st
end

@inline function (m::PlanarLayer{false})(z::AbstractVector, ps::Any, st::NamedTuple)
ps.u * Lux.apply_activation(m.activation, LinearAlgebra.dot(ps.w, z)), st
ps.u * apply_act(m.activation, LinearAlgebra.dot(ps.w, z)), st

Check warning on line 82 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L82 

Added line #L82 was not covered by tests
end

@inline function (m::PlanarLayer{false})(z::AbstractMatrix, ps::Any, st::NamedTuple)
ps.u * Lux.apply_activation(m.activation, transpose(ps.w) * z), st
ps.u * apply_act(m.activation, transpose(ps.w) * z), st

Check warning on line 86 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L86 

Added line #L86 was not covered by tests
end

@inline function pl_h(m::PlanarLayer{true}, z::AbstractVector, ps::Any, st::NamedTuple)
Lux.apply_bias_activation(m.activation, LinearAlgebra.dot(ps.w, z), only(ps.b)), st
apply_act(m.activation, LinearAlgebra.dot(ps.w, z) + only(ps.b)), st

Check warning on line 90 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L90 

Added line #L90 was not covered by tests
end

@inline function pl_h(m::PlanarLayer{true}, z::AbstractMatrix, ps::Any, st::NamedTuple)
Lux.apply_bias_activation(m.activation, transpose(ps.w) * z, only(ps.b)), st
apply_act(m.activation, muladd(transpose(ps.w), z, only(ps.b))), st

Check warning on line 94 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L94 

Added line #L94 was not covered by tests
end

@inline function pl_h(m::PlanarLayer{false}, z::AbstractVector, ps::Any, st::NamedTuple)
Lux.apply_activation(m.activation, LinearAlgebra.dot(ps.w, z)), st
apply_act(m.activation, LinearAlgebra.dot(ps.w, z)), st

Check warning on line 98 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L98 

Added line #L98 was not covered by tests
end

@inline function pl_h(m::PlanarLayer{false}, z::AbstractMatrix, ps::Any, st::NamedTuple)
Lux.apply_activation(m.activation, transpose(ps.w) * z), st
apply_act(m.activation, transpose(ps.w) * z), st

Check warning on line 102 in src/layers/planar_layer.jl

View check run for this annotation

Codecov / codecov/patch

src/layers/planar_layer.jl#L102 

Added line #L102 was not covered by tests
end
Loading