Skip to content

Splat kwargs as NamedTuple's to avoid invalidations #975

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

Open
JamesWrigley wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Splat kwargs as NamedTuple's to avoid invalidations #975

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
12 changes: 8 additions & 4 deletions lib/NonlinearSolveBase/src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ function solve_call(
_prob.kwargs[:kwargshandle] : kwargshandle

if has_kwargs(_prob)
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs), kwargs)
# `::NamedTuple` assert keeps dispatch off the invalidation-prone `merge(::Any, ::Pairs)` path
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs)::NamedTuple, kwargs)
end

checkkwargs(kwargshandle; kwargs...)
Expand Down Expand Up @@ -268,7 +269,8 @@ function init_call(
kwargshandle = has_kwargs(_prob) && haskey(_prob.kwargs, :kwargshandle) ?
_prob.kwargs[:kwargshandle] : kwargshandle
if has_kwargs(_prob)
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs), kwargs)
# `::NamedTuple` assert keeps dispatch off the invalidation-prone `merge(::Any, ::Pairs)` path
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs)::NamedTuple, kwargs)
end

checkkwargs(kwargshandle; kwargs...)
Expand Down Expand Up @@ -752,7 +754,8 @@ function _solve_adjoint(
end

if has_kwargs(_prob)
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs), kwargs)
# `::NamedTuple` assert keeps dispatch off the invalidation-prone `merge(::Any, ::Pairs)` path
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs)::NamedTuple, kwargs)
end

return if length(args) > 1
Expand All @@ -773,7 +776,8 @@ function _solve_forward(
_prob = get_concrete_problem(prob; u0 = u0, p = p, kwargs...)

if has_kwargs(_prob)
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs), kwargs)
# `::NamedTuple` assert keeps dispatch off the invalidation-prone `merge(::Any, ::Pairs)` path
kwargs = isempty(_prob.kwargs) ? kwargs : merge(values(_prob.kwargs)::NamedTuple, kwargs)
end

return if length(args) > 1
Expand Down
Loading