diff --git a/Manifest.toml b/Manifest.toml index 030f3f2d1..e65220738 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -203,8 +203,6 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] git-tree-sha1 = "4fa023dbb15b3485426bbc6c43e030c14250d664" -repo-rev = "ap/nlls" -repo-url = "https://github.com/SciML/DiffEqBase.jl.git" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" version = "6.149.0" diff --git a/Project.toml b/Project.toml index 9411cc234..c7e57e85b 100644 --- a/Project.toml +++ b/Project.toml @@ -58,15 +58,15 @@ NonlinearSolveZygoteExt = "Zygote" [compat] ADTypes = "0.2.6" Aqua = "0.8" -ArrayInterface = "7.7" +ArrayInterface = "7.9" BandedMatrices = "1.4" BenchmarkTools = "1.4" ConcreteStructs = "0.2.3" -CUDA = "5.1" +CUDA = "5.2" DiffEqBase = "6.149.0" Enzyme = "0.11.15" FastBroadcast = "0.2.8" -FastClosures = "0.3" +FastClosures = "0.3.2" FastLevenbergMarquardt = "0.1" FiniteDiff = "2.21" FixedPointAcceleration = "0.3" @@ -82,21 +82,21 @@ NLsolve = "4.5" NLSolvers = "0.5" NaNMath = "1" NonlinearProblemLibrary = "0.1.2" -OrdinaryDiffEq = "6.63" +OrdinaryDiffEq = "6.74" Pkg = "1.10" PrecompileTools = "1.2" Preferences = "1.4" Printf = "1.10" Random = "1.91" ReTestItems = "1" -RecursiveArrayTools = "3.4" +RecursiveArrayTools = "3.8" Reexport = "1.2" SIAMFANLEquations = "1.0.1" SafeTestsets = "0.1" -SciMLBase = "2.19.0" +SciMLBase = "2.28.0" SimpleNonlinearSolve = "1.2" SparseArrays = "1.10" -SparseDiffTools = "2.14" +SparseDiffTools = "2.17" SpeedMapping = "0.3" StableRNGs = "1" StaticArrays = "1.7" @@ -105,7 +105,7 @@ Sundials = "4.23.1" Symbolics = "5.13" Test = "1.10" TimerOutputs = "0.5.23" -Zygote = "0.6.67" +Zygote = "0.6.69" julia = "1.10" [extras] diff --git a/src/core/generalized_first_order.jl b/src/core/generalized_first_order.jl index 2769736ff..5c8c3fbde 100644 --- a/src/core/generalized_first_order.jl +++ b/src/core/generalized_first_order.jl @@ -191,7 +191,8 @@ function SciMLBase.__init( GB = :LineSearch end - trace = init_nonlinearsolve_trace(prob, alg, u, fu, ApplyArray(__zero, J), du; kwargs...) + trace = init_nonlinearsolve_trace( + prob, alg, u, fu, ApplyArray(__zero, J), du; kwargs...) return GeneralizedFirstOrderAlgorithmCache{iip, GB, maxtime !== nothing}( fu, u, u_cache, p, du, J, alg, prob, jac_cache, descent_cache, linesearch_cache, diff --git a/src/internal/tracing.jl b/src/internal/tracing.jl index d5edb3a49..75fcaa66a 100644 --- a/src/internal/tracing.jl +++ b/src/internal/tracing.jl @@ -107,8 +107,8 @@ end function NonlinearSolveTraceEntry(prob::AbstractNonlinearProblem, iteration, fu, δu, J) nType = ifelse(prob isa NonlinearLeastSquaresProblem, :L2, :Inf) fnorm = prob isa NonlinearLeastSquaresProblem ? norm(fu, 2) : norm(fu, Inf) - return NonlinearSolveTraceEntry{nType}(iteration, fnorm, norm(δu, 2), - __cond(J), nothing, nothing, nothing, nothing) + return NonlinearSolveTraceEntry{nType}( + iteration, fnorm, norm(δu, 2), __cond(J), nothing, nothing, nothing, nothing) end function NonlinearSolveTraceEntry(prob::AbstractNonlinearProblem, iteration, fu, δu, J, u)