From 61ea504aecfec1ac7dcba620e575ec6e0b4e9d02 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Mon, 7 Oct 2024 15:41:40 -0400 Subject: [PATCH] feat: bump major version of SimpleNonlinearSolve --- lib/NonlinearSolveBase/src/NonlinearSolveBase.jl | 7 ++++--- lib/SimpleNonlinearSolve/Project.toml | 4 +--- .../src/SimpleNonlinearSolve.jl | 13 ++++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/NonlinearSolveBase/src/NonlinearSolveBase.jl b/lib/NonlinearSolveBase/src/NonlinearSolveBase.jl index 5e1a37326..645b84959 100644 --- a/lib/NonlinearSolveBase/src/NonlinearSolveBase.jl +++ b/lib/NonlinearSolveBase/src/NonlinearSolveBase.jl @@ -35,8 +35,9 @@ include("autodiff.jl") (select_forward_mode_autodiff, select_reverse_mode_autodiff, select_jacobian_autodiff)) -export RelTerminationMode, AbsTerminationMode, NormTerminationMode, RelNormTerminationMode, - AbsNormTerminationMode, RelNormSafeTerminationMode, AbsNormSafeTerminationMode, - RelNormSafeNormTerminationMode, AbsNormSafeNormTerminationMode +export RelTerminationMode, AbsTerminationMode, + NormTerminationMode, RelNormTerminationMode, AbsNormTerminationMode, + RelNormSafeTerminationMode, AbsNormSafeTerminationMode, + RelNormSafeBestTerminationMode, AbsNormSafeBestTerminationMode end diff --git a/lib/SimpleNonlinearSolve/Project.toml b/lib/SimpleNonlinearSolve/Project.toml index 8c6322730..5f708e564 100644 --- a/lib/SimpleNonlinearSolve/Project.toml +++ b/lib/SimpleNonlinearSolve/Project.toml @@ -1,7 +1,7 @@ name = "SimpleNonlinearSolve" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" authors = ["SciML"] -version = "1.13.0" +version = "2.0.0" [deps] ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" @@ -19,7 +19,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MaybeInplace = "bb5d69b7-63fc-4a16-80bd-7e42200c7bdb" NonlinearSolveBase = "be0214bd-f91f-a760-ac4e-3421ce2b2da0" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" -Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" @@ -63,7 +62,6 @@ Pkg = "1.10" PolyesterForwardDiff = "0.1" PrecompileTools = "1.2" Random = "1.10" -Reexport = "1.2" ReverseDiff = "1.15" SciMLBase = "2.50" SciMLSensitivity = "7.68" diff --git a/lib/SimpleNonlinearSolve/src/SimpleNonlinearSolve.jl b/lib/SimpleNonlinearSolve/src/SimpleNonlinearSolve.jl index 23de7dbc6..4ed53295e 100644 --- a/lib/SimpleNonlinearSolve/src/SimpleNonlinearSolve.jl +++ b/lib/SimpleNonlinearSolve/src/SimpleNonlinearSolve.jl @@ -8,13 +8,12 @@ using LineSearch: LiFukushimaLineSearch using LinearAlgebra: LinearAlgebra, dot using MaybeInplace: @bb, setindex_trait, CannotSetindex, CanSetindex using PrecompileTools: @compile_workload, @setup_workload -using Reexport: @reexport -@reexport using SciMLBase # I don't like this but needed to avoid a breaking change -using SciMLBase: AbstractNonlinearAlgorithm, NonlinearProblem, ReturnCode +using SciMLBase: AbstractNonlinearAlgorithm, NonlinearProblem, NonlinearLeastSquaresProblem, + IntervalNonlinearProblem, ReturnCode using StaticArraysCore: StaticArray, SArray, SVector, MArray # AD Dependencies -using ADTypes: AutoFiniteDiff, AutoForwardDiff, AutoPolyesterForwardDiff +using ADTypes: ADTypes using DifferentiationInterface: DifferentiationInterface using FiniteDiff: FiniteDiff using ForwardDiff: ForwardDiff @@ -118,13 +117,17 @@ function solve_adjoint_internal end end end -export AutoFiniteDiff, AutoForwardDiff, AutoPolyesterForwardDiff +export IntervalNonlinearProblem export Alefeld, Bisection, Brent, Falsi, ITP, Ridder +export NonlinearProblem, NonlinearLeastSquaresProblem + export SimpleBroyden, SimpleKlement, SimpleLimitedMemoryBroyden export SimpleDFSane export SimpleGaussNewton, SimpleNewtonRaphson, SimpleTrustRegion export SimpleHalley +export solve + end