From 8a3f66df3df37fa2f2047ca9d5d857ebe530f5d4 Mon Sep 17 00:00:00 2001 From: MartinuzziFrancesco Date: Thu, 19 Nov 2026 21:31:36 +0100 Subject: [PATCH] Promote cell scalar hyperparameters with the state eltype, not the input eltype Integer input made T = eltype(inp) an integer type, so convert(T, 0.5) threw InexactError in ESN, EIESN, AdditiveEIESN, ES2N, ResESN, EuSN and the memory cells. T is now promote_type(eltype(inp), eltype(hidden_state)), which is unchanged for Float32 and Float64 inputs. Co-Authored-By: Claude Haiku 5.5 --- src/layers/additive_eiesn_cell.jl | 2 +- src/layers/eiesn_cell.jl | 2 +- src/layers/es2n_cell.jl | 2 +- src/layers/esn_cell.jl | 2 +- src/layers/eusn_cell.jl | 2 +- src/layers/memoryesn_cell.jl | 2 +- src/layers/memoryresesn_cell.jl | 2 +- src/layers/resesn_cell.jl | 2 +- test/Models/esn_tests.jl | 17 +++++++++++++++++ 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/layers/additive_eiesn_cell.jl b/src/layers/additive_eiesn_cell.jl index cf4de6ab2..8517b9fd8 100644 --- a/src/layers/additive_eiesn_cell.jl +++ b/src/layers/additive_eiesn_cell.jl @@ -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)) diff --git a/src/layers/eiesn_cell.jl b/src/layers/eiesn_cell.jl index 790039e2d..2d2c9147a 100644 --- a/src/layers/eiesn_cell.jl +++ b/src/layers/eiesn_cell.jl @@ -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)) diff --git a/src/layers/es2n_cell.jl b/src/layers/es2n_cell.jl index 3886d305c..ed041cf54 100644 --- a/src/layers/es2n_cell.jl +++ b/src/layers/es2n_cell.jl @@ -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) diff --git a/src/layers/esn_cell.jl b/src/layers/esn_cell.jl index 21941cc92..79480e1bf 100644 --- a/src/layers/esn_cell.jl +++ b/src/layers/esn_cell.jl @@ -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) diff --git a/src/layers/eusn_cell.jl b/src/layers/eusn_cell.jl index a9e389035..fb490b3c5 100644 --- a/src/layers/eusn_cell.jl +++ b/src/layers/eusn_cell.jl @@ -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) diff --git a/src/layers/memoryesn_cell.jl b/src/layers/memoryesn_cell.jl index 772689ed0..cdd7007f1 100644 --- a/src/layers/memoryesn_cell.jl +++ b/src/layers/memoryesn_cell.jl @@ -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) diff --git a/src/layers/memoryresesn_cell.jl b/src/layers/memoryresesn_cell.jl index f288b1b65..8e9bca97a 100644 --- a/src/layers/memoryresesn_cell.jl +++ b/src/layers/memoryresesn_cell.jl @@ -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) diff --git a/src/layers/resesn_cell.jl b/src/layers/resesn_cell.jl index da6be7255..ddb90cbe6 100644 --- a/src/layers/resesn_cell.jl +++ b/src/layers/resesn_cell.jl @@ -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) diff --git a/test/Models/esn_tests.jl b/test/Models/esn_tests.jl index 2a40e06a6..852d4bb5c 100644 --- a/test/Models/esn_tests.jl +++ b/test/Models/esn_tests.jl @@ -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