Skip to content

Commit 1423d11

Browse files
Merge pull request #954 from SciML/ap/tstable_termination
Rework the Termination Condition API to be type stable
2 parents e9316ae + 43206a7 commit 1423d11

File tree

6 files changed

+392
-23
lines changed

6 files changed

+392
-23
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ on:
66
push:
77
branches:
88
- master
9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
914
jobs:
1015
test:
1116
runs-on: ubuntu-latest

.github/workflows/Downstream.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ on:
44
branches: [master]
55
tags: [v*]
66
pull_request:
7-
7+
concurrency:
8+
# Skip intermediate builds: always.
9+
# Cancel intermediate builds: only if it is a pull request build.
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
812
jobs:
913
test:
1014
name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.julia-version }}

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.135.0"
4+
version = "6.136.0"
55

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

src/DiffEqBase.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,13 @@ export initialize!, finalize!
171171

172172
export SensitivityADPassThrough
173173

174+
export SteadyStateDiffEqTerminationMode, SimpleNonlinearSolveTerminationMode,
175+
NormTerminationMode, RelTerminationMode, RelNormTerminationMode, AbsTerminationMode,
176+
AbsNormTerminationMode, RelSafeTerminationMode, AbsSafeTerminationMode,
177+
RelSafeBestTerminationMode, AbsSafeBestTerminationMode
178+
# Deprecated API
174179
export NLSolveTerminationMode,
175-
NLSolveSafeTerminationOptions, NLSolveTerminationCondition,
176-
NLSolveSafeTerminationResult
180+
NLSolveSafeTerminationOptions, NLSolveTerminationCondition, NLSolveSafeTerminationResult
177181

178182
export KeywordArgError, KeywordArgWarn, KeywordArgSilent
179183

src/common_defaults.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ end
4242
end
4343
@inline ODE_DEFAULT_NORM(u, t) = norm(u)
4444

45-
@inline NLSOLVE_DEFAULT_NORM(u) = ODE_DEFAULT_NORM(u, nothing)
45+
@inline NONLINEARSOLVE_DEFAULT_NORM(u) = ODE_DEFAULT_NORM(u, nothing)
4646

4747
@inline ODE_DEFAULT_ISOUTOFDOMAIN(u, p, t) = false
4848
@inline function ODE_DEFAULT_PROG_MESSAGE(dt, u::Array, p, t)

0 commit comments

Comments
 (0)