Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/layers/additive_eiesn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function initialparameters(rng::AbstractRNG, cell::AdditiveEIESNCell)
end

function (cell::AdditiveEIESNCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))

b_ex = safe_getproperty(ps, Val(:bias_ex))
b_inh = safe_getproperty(ps, Val(:bias_inh))
Expand Down
2 changes: 1 addition & 1 deletion src/layers/eiesn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function initialparameters(rng::AbstractRNG, cell::EIESNCell)
end

function (cell::EIESNCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))

b_ex = safe_getproperty(ps, Val(:bias_ex))
b_inh = safe_getproperty(ps, Val(:bias_inh))
Expand Down
2 changes: 1 addition & 1 deletion src/layers/es2n_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function initialparameters(rng::AbstractRNG, esn::ES2NCell)
end

function (esn::ES2NCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
t_prox = T(esn.proximity)
win_inp = dense_bias(ps.input_matrix, inp, nothing)
Expand Down
2 changes: 1 addition & 1 deletion src/layers/esn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function (esn::AbstractEchoStateNetworkCell)(inp::AbstractArray, ps, st::NamedTu
end

function (esn::ESNCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
win_inp = dense_bias(ps.input_matrix, inp, nothing)
w_state = dense_bias(ps.reservoir_matrix, hidden_state, bias)
Expand Down
2 changes: 1 addition & 1 deletion src/layers/eusn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function EuSNCell(
end

function (esn::EuSNCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
t_lc = T(esn.leak_coefficient)
t_diff = T(esn.diffusion)
Expand Down
2 changes: 1 addition & 1 deletion src/layers/memoryesn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function (esn::MemoryESNCell)(
(inp, (hidden_state, memory_state))::Tuple{AbstractArray, Tuple{AbstractArray, AbstractArray}},
ps, st::NamedTuple
)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
t_lc = T(esn.leak_coefficient)
win_inp = dense_bias(ps.input_matrix, inp, nothing)
Expand Down
2 changes: 1 addition & 1 deletion src/layers/memoryresesn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function (esn::MemoryResESNCell)(
(inp, (hidden_state, memory_state))::Tuple{AbstractArray, Tuple{AbstractArray, AbstractArray}},
ps, st::NamedTuple
)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
t_alpha = T(esn.alpha)
t_beta = T(esn.beta)
Expand Down
2 changes: 1 addition & 1 deletion src/layers/resesn_cell.jl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function initialparameters(rng::AbstractRNG, esn::ResESNCell)
end

function (esn::ResESNCell)((inp, (hidden_state,))::InputType, ps, st::NamedTuple)
T = eltype(inp)
T = promote_type(eltype(inp), eltype(hidden_state))
bias = safe_getproperty(ps, Val(:bias))
t_alpha = T(esn.alpha)
t_beta = T(esn.beta)
Expand Down
17 changes: 17 additions & 0 deletions test/Models/esn_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1164,4 +1164,21 @@ begin
end
end

@testset "Integer input with fractional hyperparameters" begin
x = rand(1:10, 2, 20)
models = (
ESN(2, 5, 2; leak_coefficient = 0.5),
EIESN(2, 5, 2),
AdditiveEIESN(2, 5, 2),
ES2N(2, 5, 2; proximity = 0.5),
ResESN(2, 5, 2; alpha = 0.5),
EuSN(2, 5, 2; leak_coefficient = 0.5),
)
for m in models
ps, st = setup(MersenneTwister(1), m)
states, _ = collectstates(m, x, ps, st)
@test eltype(states) == Float32
@test size(states) == (5, 20)
end
end
end
Loading