From 19fb77321e9945e44bdb674cfda59ff7aa71c9cd Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Sun, 1 Oct 2023 21:40:12 -0400 Subject: [PATCH 1/3] make construction of type stable TP BVProblem easier --- Project.toml | 2 +- src/problems/bvp_problems.jl | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 364102ac5..332168cd1 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "SciMLBase" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" authors = ["Chris Rackauckas and contributors"] -version = "2.0.7" +version = "2.1.0" [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" diff --git a/src/problems/bvp_problems.jl b/src/problems/bvp_problems.jl index 2e9f1feab..b15b5d6a9 100644 --- a/src/problems/bvp_problems.jl +++ b/src/problems/bvp_problems.jl @@ -6,7 +6,7 @@ struct StandardBVProblem end """ $(TYPEDEF) """ -struct TwoPointBVProblem end +struct TwoPointBVProblem{iip} end # The iip is needed to make type stable construction easier @doc doc""" @@ -112,7 +112,7 @@ struct BVProblem{uType, tType, isinplace, P, F, BF, PT, K} <: p = NullParameters(); problem_type=nothing, kwargs...) where {iip, TP} _tspan = promote_tspan(tspan) warn_paramtype(p) - prob_type = TP ? TwoPointBVProblem() : StandardBVProblem() + prob_type = TP ? TwoPointBVProblem{iip}() : StandardBVProblem() # Needed to ensure that `problem_type` doesn't get passed in kwargs if problem_type === nothing problem_type = prob_type @@ -149,11 +149,21 @@ struct TwoPointBVPFunction{iip} end return BVPFunction{iip}(args...; kwargs..., twopoint=true) end +function TwoPointBVProblem{iip}(f, bc, u0, tspan, p = NullParameters(); + bcresid_prototype=nothing, kwargs...) where {iip} + return TwoPointBVProblem(TwoPointBVPFunction{iip}(f, bc; bcresid_prototype), u0, tspan, p; + kwargs...) +end function TwoPointBVProblem(f, bc, u0, tspan, p = NullParameters(); bcresid_prototype=nothing, kwargs...) return TwoPointBVProblem(TwoPointBVPFunction(f, bc; bcresid_prototype), u0, tspan, p; kwargs...) end +function TwoPointBVProblem{iip}(f::AbstractBVPFunction{iip, twopoint}, u0, tspan, + p = NullParameters(); kwargs...) where {iip, twopoint} + @assert twopoint "`TwoPointBVProblem` can only be used with a `TwoPointBVPFunction`. Instead of using `BVPFunction`, use `TwoPointBVPFunction` or pass a kwarg `twopoint=true` during the construction of the `BVPFunction`." + return BVProblem{iip}(f, f.bc, u0, tspan, p; kwargs...) +end function TwoPointBVProblem(f::AbstractBVPFunction{iip, twopoint}, u0, tspan, p = NullParameters(); kwargs...) where {iip, twopoint} @assert twopoint "`TwoPointBVProblem` can only be used with a `TwoPointBVPFunction`. Instead of using `BVPFunction`, use `TwoPointBVPFunction` or pass a kwarg `twopoint=true` during the construction of the `BVPFunction`." From d08f3f7bfd571cf394e011397e8354b63fceac35 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Sun, 1 Oct 2023 21:59:27 -0400 Subject: [PATCH 2/3] Add remake for BVProblem --- src/remake.jl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/remake.jl b/src/remake.jl index 7bbc6de6a..62fb15af2 100644 --- a/src/remake.jl +++ b/src/remake.jl @@ -120,6 +120,67 @@ function remake(prob::ODEProblem; f = missing, end end +""" + remake(prob::BVProblem; f = missing, u0 = missing, tspan = missing, + p = missing, kwargs = missing, problem_type = missing, _kwargs...) + +Remake the given `BVProblem`. +""" +function remake(prob::BVProblem; f = missing, bc = missing, u0 = missing, tspan = missing, + p = missing, kwargs = missing, problem_type = missing, _kwargs...) + if tspan === missing + tspan = prob.tspan + end + + if p === missing && u0 === missing + p, u0 = prob.p, prob.u0 + else # at least one of them has a value + if p === missing + p = prob.p + end + if u0 === missing + u0 = prob.u0 + end + end + + iip = isinplace(prob) + + if problem_type === missing + problem_type = prob.problem_type + end + + twopoint = problem_type isa TwoPointBVProblem + + if bc === missing + bc = prob.bc + end + + if f === missing + _f = prob.f + elseif f isa BVPFunction + _f = f + bc = f.bc + elseif specialization(prob.f) === FunctionWrapperSpecialize + ptspan = promote_tspan(tspan) + if iip + _f = BVPFunction{iip, FunctionWrapperSpecialize, twopoint}(wrapfun_iip(f, + (u0, u0, p, ptspan[1])), bc; prob.f.bcresid_prototype) + else + _f = BVPFunction{iip, FunctionWrapperSpecialize, twopoint}(wrapfun_oop(f, + (u0, p, ptspan[1])), bc; prob.f.bcresid_prototype) + end + else + _f = BVPFunction{isinplace(prob), specialization(prob.f), twopoint}(f, bc; + prob.f.bcresid_prototype) + end + + if kwargs === missing + BVProblem{iip}(_f, bc, u0, tspan, p; problem_type, prob.kwargs..., _kwargs...) + else + BVProblem{iip}(_f, bc, u0, tspan, p; problem_type, kwargs...) + end +end + """ remake(prob::SDEProblem; f = missing, u0 = missing, tspan = missing, p = missing, noise = missing, noise_rate_prototype = missing, From a12a4fc0896fccb93a9fd77e91aeb18dd5958bd1 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Mon, 2 Oct 2023 10:57:31 -0400 Subject: [PATCH 3/3] Allow twopoint to be a Val --- src/problems/bvp_problems.jl | 10 ++++++---- src/scimlfunctions.jl | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/problems/bvp_problems.jl b/src/problems/bvp_problems.jl index b15b5d6a9..fd36c1908 100644 --- a/src/problems/bvp_problems.jl +++ b/src/problems/bvp_problems.jl @@ -144,15 +144,17 @@ end # But we need it for function calls like TwoPointBVProblem{iip}(...) = ... struct TwoPointBVPFunction{iip} end -@inline TwoPointBVPFunction(args...; kwargs...) = BVPFunction(args...; kwargs..., twopoint=true) +@inline function TwoPointBVPFunction(args...; kwargs...) + return BVPFunction(args...; kwargs..., twopoint = Val(true)) +end @inline function TwoPointBVPFunction{iip}(args...; kwargs...) where {iip} - return BVPFunction{iip}(args...; kwargs..., twopoint=true) + return BVPFunction{iip}(args...; kwargs..., twopoint = Val(true)) end function TwoPointBVProblem{iip}(f, bc, u0, tspan, p = NullParameters(); bcresid_prototype=nothing, kwargs...) where {iip} - return TwoPointBVProblem(TwoPointBVPFunction{iip}(f, bc; bcresid_prototype), u0, tspan, p; - kwargs...) + return TwoPointBVProblem(TwoPointBVPFunction{iip}(f, bc; bcresid_prototype), u0, tspan, + p; kwargs...) end function TwoPointBVProblem(f, bc, u0, tspan, p = NullParameters(); bcresid_prototype=nothing, kwargs...) diff --git a/src/scimlfunctions.jl b/src/scimlfunctions.jl index c74808df2..5cb5d6bb2 100644 --- a/src/scimlfunctions.jl +++ b/src/scimlfunctions.jl @@ -4064,12 +4064,13 @@ function BVPFunction{iip, specialize, twopoint}(f, bc; end end -function BVPFunction{iip}(f, bc; twopoint::Bool=false, kwargs...) where {iip} - BVPFunction{iip, FullSpecialize, twopoint}(f, bc; kwargs...) +function BVPFunction{iip}(f, bc; twopoint::Union{Val, Bool}=Val(false), + kwargs...) where {iip} + BVPFunction{iip, FullSpecialize, _unwrap_val(twopoint)}(f, bc; kwargs...) end BVPFunction{iip}(f::BVPFunction, bc; kwargs...) where {iip} = f -function BVPFunction(f, bc; twopoint::Bool=false, kwargs...) - BVPFunction{isinplace(f, 4), FullSpecialize, twopoint}(f, bc; kwargs...) +function BVPFunction(f, bc; twopoint::Union{Val, Bool}=Val(false), kwargs...) + BVPFunction{isinplace(f, 4), FullSpecialize, _unwrap_val(twopoint)}(f, bc; kwargs...) end BVPFunction(f::BVPFunction; kwargs...) = f