Merge pull request #954 from SciML/ap/tstable_termination

Rework the Termination Condition API to be type stable
SciML · Oct 31, 2023 · 1423d11 · 1423d11
2 parents e9316ae + 43206a7
commit 1423d11
Show file tree

Hide file tree

Showing 6 changed files with 392 additions and 23 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -6,6 +6,11 @@ on:
   push:
     branches:
       - master
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
   test:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml
@@ -4,7 +4,11 @@ on:
     branches: [master]
     tags: [v*]
   pull_request:
-
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
   test:
     name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.julia-version }}

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "DiffEqBase"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "6.135.0"
+version = "6.136.0"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

diff --git a/src/DiffEqBase.jl b/src/DiffEqBase.jl
@@ -171,9 +171,13 @@ export initialize!, finalize!
 
 export SensitivityADPassThrough
 
+export SteadyStateDiffEqTerminationMode, SimpleNonlinearSolveTerminationMode,
+    NormTerminationMode, RelTerminationMode, RelNormTerminationMode, AbsTerminationMode,
+    AbsNormTerminationMode, RelSafeTerminationMode, AbsSafeTerminationMode,
+    RelSafeBestTerminationMode, AbsSafeBestTerminationMode
+# Deprecated API
 export NLSolveTerminationMode,
-    NLSolveSafeTerminationOptions, NLSolveTerminationCondition,
-    NLSolveSafeTerminationResult
+    NLSolveSafeTerminationOptions, NLSolveTerminationCondition, NLSolveSafeTerminationResult
 
 export KeywordArgError, KeywordArgWarn, KeywordArgSilent
 

diff --git a/src/common_defaults.jl b/src/common_defaults.jl
@@ -42,7 +42,7 @@ end
 end
 @inline ODE_DEFAULT_NORM(u, t) = norm(u)
 
-@inline NLSOLVE_DEFAULT_NORM(u) = ODE_DEFAULT_NORM(u, nothing)
+@inline NONLINEARSOLVE_DEFAULT_NORM(u) = ODE_DEFAULT_NORM(u, nothing)
 
 @inline ODE_DEFAULT_ISOUTOFDOMAIN(u, p, t) = false
 @inline function ODE_DEFAULT_PROG_MESSAGE(dt, u::Array, p, t)