Skip to content

Commit 0e2eb79

Browse files
committed
Drop the jacreg for multi scale models
1 parent 2c3662b commit 0e2eb79

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

Manifest.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.0-rc2"
44
manifest_format = "2.0"
5-
project_hash = "014ca85a3845de2d1ab4491eb2d8b2f946e37a20"
5+
project_hash = "8d33856ceafbd0190b2f9c40c1bcfddbb51890fa"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "332e5d7baeff8497b923b730b994fa480601efc7"
@@ -696,9 +696,11 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
696696

697697
[[deps.LinearSolve]]
698698
deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "StaticArraysCore", "UnPack"]
699-
git-tree-sha1 = "03cd36673f050ec49f9bdfce31e0e7e22d877e64"
699+
git-tree-sha1 = "7c9f62dc6f7d11b0f8dfb3c1f3637cb220dc9866"
700+
repo-rev = "ap/normal_cholesky_dispatches"
701+
repo-url = "https://github.com/SciML/LinearSolve.jl.git"
700702
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
701-
version = "2.21.0"
703+
version = "2.21.1"
702704

703705
[deps.LinearSolve.extensions]
704706
LinearSolveBandedMatricesExt = "BandedMatrices"

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
1010
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
1111
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1212
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
13+
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
1314
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
1415
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1516
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"

src/layers.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,9 @@ julia> model(x, ps, st);
306306
```
307307
"""
308308
function MultiScaleDeepEquilibriumNetwork(main_layers::Tuple, mapping_layers::Matrix,
309-
post_fuse_layer::Union{Nothing, Tuple}, solver, scales; kwargs...)
309+
post_fuse_layer::Union{Nothing, Tuple}, solver, scales;
310+
jacobian_regularization=nothing, kwargs...)
311+
@assert jacobian_regularization === nothing "Jacobian Regularization is not supported yet for MultiScale Models."
310312
l1 = Parallel(nothing, main_layers...)
311313
l2 = BranchLayer(Parallel.(+, map(x -> tuple(x...), eachrow(mapping_layers))...)...)
312314

test/layers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ end
108108

109109
model_type = (:deq, :skipdeq, :skipregdeq, :node)
110110
solvers = (VCAB3(), Tsit5(), NewtonRaphson(), SimpleLimitedMemoryBroyden())
111-
jacobian_regularizations = (nothing, AutoFiniteDiff(), AutoZygote())
111+
jacobian_regularizations = (nothing,)
112112

113113
for mtype in model_type, jacobian_regularization in jacobian_regularizations
114114
@testset "Solver: $(__nameof(solver))" for solver in solvers

0 commit comments

Comments
 (0)