Skip to content

Commit 6397213

Browse files
Merge pull request #943 from SciML/ap/fix_nlsolve_dispatches
Unbreak non-DEAlgorithm solver handling
2 parents 782a88b + 2f0a9a4 commit 6397213

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/Downstream.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ jobs:
3939
- {user: SciML, repo: SteadyStateDiffEq.jl, group: All}
4040
- {user: SciML, repo: DifferentialEquations.jl, group: All}
4141
- {user: SciML, repo: ModelingToolkit.jl, group: All}
42+
- {user: SciML, repo: SciMLSensitivity.jl, group: Core1}
43+
- {user: SciML, repo: SciMLSensitivity.jl, group: Core2}
44+
- {user: SciML, repo: SciMLSensitivity.jl, group: Core3}
45+
- {user: SciML, repo: SciMLSensitivity.jl, group: Core4}
46+
- {user: SciML, repo: SciMLSensitivity.jl, group: Core5}
47+
- {user: SciML, repo: SciMLSensitivity.jl, group: SDE1}
48+
- {user: SciML, repo: SciMLSensitivity.jl, group: SDE2}
49+
- {user: SciML, repo: SciMLSensitivity.jl, group: SDE3}
4250

4351
steps:
4452
- uses: actions/checkout@v4

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "DiffEqBase"
22
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
33
authors = ["Chris Rackauckas <[email protected]>"]
4-
version = "6.130.4"
4+
version = "6.130.5"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/solve.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,8 +1427,8 @@ function _solve_adjoint(prob, sensealg, u0, p, originator, args...; merge_callba
14271427
alg = args[1]
14281428
alg, get_concrete_problem(prob, isadaptive(alg); u0 = u0, p = p, kwargs...)
14291429
else # Default algorithm handling
1430-
alg = !(typeof(prob) <: DiscreteProblem)
1431-
alg, get_concrete_problem(prob, alg; u0 = u0, p = p,
1430+
alg = isempty(args) ? nothing : args[1]
1431+
alg, get_concrete_problem(prob, !(typeof(prob) <: DiscreteProblem); u0 = u0, p = p,
14321432
kwargs...)
14331433
end
14341434

@@ -1461,8 +1461,8 @@ function _solve_forward(prob, sensealg, u0, p, originator, args...; merge_callba
14611461
alg = args[1]
14621462
alg, get_concrete_problem(prob, isadaptive(alg); u0 = u0, p = p, kwargs...)
14631463
else # Default algorithm handling
1464-
alg = !(typeof(prob) <: DiscreteProblem)
1465-
alg, get_concrete_problem(prob, alg; u0 = u0, p = p,
1464+
alg = isempty(args) ? nothing : args[1]
1465+
alg, get_concrete_problem(prob, !(typeof(prob) <: DiscreteProblem); u0 = u0, p = p,
14661466
kwargs...)
14671467
end
14681468

0 commit comments

Comments
 (0)