adding JET and fixes

Author: MartinuzziFrancesco

Project.toml

@@ -29,6 +29,7 @@ Aqua = "0.8"
 CellularAutomata = "0.0.2"
 Compat = "4.16.0"
 DifferentialEquations = "7.15.0"
+JET = "0.9.18"
 LIBSVM = "0.8"
 LinearAlgebra = "1.10"
 MLJLinearModels = "0.9.2, 0.10"
@@ -46,11 +47,12 @@ julia = "1.10"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 LIBSVM = "b1bec4e5-fd48-53fe-b0cb-9723c09d164b"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 MLJLinearModels = "6ee0df7b-362f-4a72-a706-9e79364fb692"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "Test", "SafeTestsets", "DifferentialEquations", "MLJLinearModels", "LIBSVM", "Statistics", "SparseArrays"]
+test = ["Aqua", "Test", "SafeTestsets", "DifferentialEquations", "MLJLinearModels", "LIBSVM", "Statistics", "SparseArrays", "JET"]

src/ReservoirComputing.jl

@@ -5,7 +5,7 @@ using CellularAutomata: CellularAutomaton
 using Compat: @compat
 using LinearAlgebra: eigvals, mul!, I, qr, Diagonal
 using NNlib: fast_act, sigmoid
-using Random: Random, AbstractRNG, randperm
+using Random: Random, AbstractRNG, randperm, rand
 using Reexport: Reexport, @reexport
 using WeightInitializers: DeviceAgnostic, PartialFunction, Utils
 @reexport using WeightInitializers
@@ -40,7 +40,7 @@ export scaled_rand, weighted_init, informed_init, minimal_init, chebyshev_mappin
        logistic_mapping, modified_lm
 export rand_sparse, delay_line, delay_line_backward, cycle_jumps,
        simple_cycle, pseudo_svd, chaotic_init
-export RNN, MRNN, GRU, GRUParams, FullyGated, Minimal
+export RNN, MRNN, GRU, GRUParams, FullyGated
 export train
 export ESN, HybridESN, KnowledgeModel, DeepESN
 export RECA

src/esn/esn_inits.jl

@@ -146,7 +146,7 @@ Create an input layer for informed echo state networks [^Pathak2018].
     Chaos: An Interdisciplinary Journal of Nonlinear Science 28.4 (2018).
 """
 function informed_init(rng::AbstractRNG, ::Type{T}, dims::Integer...;
-        scaling=T(0.1), model_in_size, gamma=T(0.5)) where {T <: Number}
+        scaling=T(0.1), model_in_size::Int, gamma=T(0.5)) where {T <: Number}
     res_size, in_size = dims
     state_size = in_size - model_in_size
 
@@ -162,18 +162,17 @@ function informed_init(rng::AbstractRNG, ::Type{T}, dims::Integer...;
     for i in 1:num_for_state
         idxs = findall(Bool[zero_connections .== input_matrix[i, :]
                             for i in 1:size(input_matrix, 1)])
-        random_row_idx = idxs[DeviceAgnostic.rand(rng, T, 1:end)]
-        random_clm_idx = range(1, state_size; step=1)[DeviceAgnostic.rand(rng, T, 1:end)]
+        random_row_idx = idxs[rand(1:length(idxs))]
+        random_clm_idx = rand(state_size+1:in_size)
         input_matrix[random_row_idx, random_clm_idx] = (DeviceAgnostic.rand(rng, T) -
                                                         T(0.5)) .* (T(2) * scaling)
     end
 
     for i in 1:num_for_model
         idxs = findall(Bool[zero_connections .== input_matrix[i, :]
                             for i in 1:size(input_matrix, 1)])
-        random_row_idx = idxs[DeviceAgnostic.rand(rng, T, 1:end)]
-        random_clm_idx = range(state_size + 1, in_size; step=1)[DeviceAgnostic.rand(
-            rng, T, 1:end)]
+        random_row_idx = idxs[rand(1:length(idxs))]
+        random_clm_idx = rand(state_size+1:in_size)
         input_matrix[random_row_idx, random_clm_idx] = (DeviceAgnostic.rand(rng, T) -
                                                         T(0.5)) .* (T(2) * scaling)
     end
@@ -298,7 +297,7 @@ function irrational(rng::AbstractRNG, ::Type{T}, res_size::Int, in_size::Int;
         end
     end
 
-    return T.(input_matrix)
+    return map(T, input_matrix)
 end
 
 @doc raw"""
@@ -888,8 +887,8 @@ end
 
 """
     pseudo_svd([rng], [T], dims...; 
-        max_value=1.0, sparsity=0.1, sorted=true, reverse_sort=false,
-        return_sparse=false)
+        max_value=1.0, sparsity=0.1, sorted=true,
+        return_sparse=false, return_diag=false)
 
 Returns an initializer to build a sparse reservoir matrix with the given
 `sparsity` by using a pseudo-SVD approach as described in [^yang].
@@ -910,8 +909,6 @@ Returns an initializer to build a sparse reservoir matrix with the given
     Default is 0.1
   - `sorted`: A boolean indicating whether to sort the singular values before
     creating the diagonal matrix. Default is `true`.
-  - `reverse_sort`: A boolean indicating whether to reverse the sorted
-    singular values. Default is `false`.
   - `return_sparse`: flag for returning a `sparse` matrix.
     Default is `false`.
   - `return_diag`: flag for returning a `Diagonal` matrix. If both `return_diag`
@@ -936,13 +933,12 @@ julia> res_matrix = pseudo_svd(5, 5)
 """
 function pseudo_svd(rng::AbstractRNG, ::Type{T}, dims::Integer...;
         max_value::Number=T(1.0), sparsity::Number=0.1, sorted::Bool=true,
-        reverse_sort::Bool=false, return_sparse::Bool=false,
+        return_sparse::Bool=false,
         return_diag::Bool=false) where {T <: Number}
     throw_sparse_error(return_sparse)
     reservoir_matrix = create_diag(rng, T, dims[1],
         max_value;
-        sorted=sorted,
-        reverse_sort=reverse_sort)
+        sorted=sorted)
     tmp_sparsity = get_sparsity(reservoir_matrix, dims[1])
 
     while tmp_sparsity <= sparsity
@@ -960,25 +956,17 @@ function pseudo_svd(rng::AbstractRNG, ::Type{T}, dims::Integer...;
     end
 end
 
-#hacky workaround for the moment
-function rand_range(rng, T, n::Int)
-    return Int(1 + floor(DeviceAgnostic.rand(rng, T) * n))
-end
-
-function create_diag(rng::AbstractRNG, ::Type{T}, dim::Number, max_value::Number;
-        sorted::Bool=true, reverse_sort::Bool=false) where {T <: Number}
+function create_diag(rng::AbstractRNG, ::Type{T}, dim::Integer, max_value::Number;
+                     sorted::Bool=true) where {T <: Number}
     diagonal_matrix = DeviceAgnostic.zeros(rng, T, dim, dim)
-    if sorted == true
-        if reverse_sort == true
-            diagonal_values = sort(
-                DeviceAgnostic.rand(rng, T, dim) .* max_value; rev=true)
-            diagonal_values[1] = max_value
-        else
-            diagonal_values = sort(DeviceAgnostic.rand(rng, T, dim) .* max_value)
-            diagonal_values[end] = max_value
-        end
-    else
-        diagonal_values = DeviceAgnostic.rand(rng, T, dim) .* max_value
+    diagonal_values = Array(DeviceAgnostic.rand(rng, T, dim) .* T(max_value))
+    if sorted
+        #if reverse_sort
+        #    Base.sort!(diagonal_values; rev=true)
+        #    diagonal_values[1] = T(max_value)
+        #else
+        Base.sort!(diagonal_values)
+        diagonal_values[end] = T(max_value)
     end
 
     for i in 1:dim
@@ -1003,6 +991,11 @@ function create_qmatrix(rng::AbstractRNG, ::Type{T}, dim::Number,
     return qmatrix
 end
 
+#hacky workaround for the moment
+function rand_range(rng, T, n::Int)
+    return Int(1 + floor(DeviceAgnostic.rand(rng, T) * n))
+end
+
 function get_sparsity(M, dim)
     return size(M[M .!= 0], 1) / (dim * dim - size(M[M .!= 0], 1)) #nonzero/zero elements
 end

src/esn/esn_reservoir_drivers.jl

@@ -313,13 +313,13 @@ end
 
 #check this one, not sure
 function create_gru_layers(gru, variant::Minimal, res_size, in_size)
-    Wz_in = gru.inner_layer(res_size, in_size)
-    Wz = gru.reservoir(res_size, res_size)
-    bz = gru.bias(res_size, 1)
+    Wz_in = gru.inner_layer[1](res_size, in_size)
+    Wz = gru.reservoir[1](res_size, res_size)
+    bz = gru.bias[1](res_size, 1)
 
-    Wr_in = nothing
-    Wr = nothing
-    br = nothing
+    Wr_in = gru.inner_layer[2](res_size, in_size)
+    Wr = gru.reservoir[2](res_size, res_size)
+    br = gru.bias[2](res_size, 1)
 
     return GRUParams(gru.activation_function, variant, Wz_in, Wz, bz, Wr_in, Wr, br)
 end
@@ -362,9 +362,9 @@ function obtain_gru_state!(out, variant::Minimal, gru, x, y, W, W_in, b, tmp_arr
     mul!(tmp_array[2], gru.Wz, x)
     @. tmp_array[3] = gru.activation_function[1](tmp_array[1] + tmp_array[2] + gru.bz)
 
-    mul!(tmp_array[4], W_in, y)
-    mul!(tmp_array[5], W, tmp_array[3] .* x)
-    @. tmp_array[6] = gru.activation_function[2](tmp_array[4] + tmp_array[5] + b)
+    mul!(tmp_array[7], W_in, y)
+    mul!(tmp_array[8], W, tmp_array[6] .* x)
+    @. tmp_array[9] = gru.activation_function[2](tmp_array[7] + tmp_array[8] + b)
 
     return @. out = (1 - tmp_array[3]) * x + tmp_array[3] * tmp_array[6]
 end

src/states.jl

@@ -199,7 +199,7 @@ function PaddedStates(; padding=1.0)
 end
 
 function (states_type::PaddedStates)(mat::AbstractMatrix)
-    results = states_type.(eachcol(mat))
+    results = map(states_type, eachcol(mat))
     return hcat(results...)
 end
 
@@ -294,7 +294,7 @@ nla(nlat::NonLinearAlgorithm, x_old::AbstractVecOrMat) = nlat(x_old)
 
 # dispatch over matrices for all nonlin algorithms
 function (nlat::NonLinearAlgorithm)(x_old::AbstractMatrix)
-    results = nlat.(eachcol(x_old))
+    results = map(nlat, eachcol(x_old))
     return hcat(results...)
 end
 

test/qa.jl

@@ -1,4 +1,4 @@
-using ReservoirComputing, Aqua
+using ReservoirComputing, Aqua, JET
 @testset "Aqua" begin
     Aqua.find_persistent_tasks_deps(ReservoirComputing)
     Aqua.test_ambiguities(ReservoirComputing; recursive=false)
@@ -9,3 +9,7 @@ using ReservoirComputing, Aqua
     Aqua.test_unbound_args(ReservoirComputing)
     Aqua.test_undefined_exports(ReservoirComputing)
 end
+
+@testset "JET" begin
+    JET.test_package(ReservoirComputing)
+end