Skip to content

fix: let the despecialization barrier accept unwrapped parameters #4297

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

Merged
ChrisRackauckas merged 1 commit into from
Aug 21, 2026
+21 −3
Merged

fix: let the despecialization barrier accept unwrapped parameters #4297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/DiffEqBase/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DiffEqBase"
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
version = "7.18.0"
version = "7.18.1"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
Expand Down
7 changes: 5 additions & 2 deletions lib/DiffEqBase/src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,11 @@ Base.@inline @generated function _invoke_parameter_despecialization(
f, args::Tuple{Vararg{Any, N}}
) where {N}
parameter_indices = findall(T -> T <: SciMLBase.DespecializedParameters, args.parameters)
length(parameter_indices) == 1 ||
error("a parameter-despecialization barrier requires exactly one parameter wrapper")
length(parameter_indices) <= 1 ||
error("a parameter-despecialization barrier requires at most one parameter wrapper")
# Nested AutoDespecialize calls can re-enter after an inner NonlinearFunction has
# already unwrapped the parameters.
isempty(parameter_indices) && return :(_invoke_parameter_despecialization(f, args...))
parameter_index = only(parameter_indices)
call_args = [
i == parameter_index ? :(SciMLBase.unwrap_parameters(args[$i])) : :(args[$i])
Expand Down
15 changes: 15 additions & 0 deletions lib/DiffEqBase/test/despecialized_p_test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,18 @@ end
@test seen_sdde_noise_parameter[] === DynamicSDEParameters
@test SciMLBase.unwrapped_f(sdde_concrete.f.g) === dynamic_sdde_noise!
end

@testset "the barrier accepts already-unwrapped parameters" begin
p = DynamicP(0.5)
collect_args(args...) = args

wrapped = SciMLBase.DespecializedParameters(p)
@test DiffEqBase._invoke_parameter_despecialization(collect_args, (1, wrapped, 2)) ==
(1, p, 2)

@test DiffEqBase._invoke_parameter_despecialization(collect_args, (1, p, 2)) == (1, p, 2)

@test_throws "at most one parameter wrapper" DiffEqBase._invoke_parameter_despecialization(
collect_args, (wrapped, wrapped)
)
end
Loading