diff --git a/Project.toml b/Project.toml index 6e897bae3..b60b52a18 100644 --- a/Project.toml +++ b/Project.toml @@ -63,7 +63,7 @@ Aqua = "0.8" ArrayInterface = "7.16" BandedMatrices = "1.5" BenchmarkTools = "1.4" -BracketingNonlinearSolve = "1" +BracketingNonlinearSolve = "1.3" CUDA = "5.5" CommonSolve = "0.2.4" ConcreteStructs = "0.2.3" @@ -88,10 +88,10 @@ NLSolvers = "0.5" NLsolve = "4.5" NaNMath = "1" NonlinearProblemLibrary = "0.1.2" -NonlinearSolveBase = "1.4" -NonlinearSolveFirstOrder = "1.2" -NonlinearSolveQuasiNewton = "1.1" -NonlinearSolveSpectralMethods = "1.1" +NonlinearSolveBase = "1.14" +NonlinearSolveFirstOrder = "1.7" +NonlinearSolveQuasiNewton = "1.8" +NonlinearSolveSpectralMethods = "1.3" OrdinaryDiffEqTsit5 = "1.1.0" PETSc = "0.3" Pkg = "1.10" @@ -103,7 +103,7 @@ ReTestItems = "1.24" Reexport = "1.2.2" SIAMFANLEquations = "1.0.1" SciMLBase = "2.69" -SimpleNonlinearSolve = "2.1" +SimpleNonlinearSolve = "2.7" SparseArrays = "1.10" SparseConnectivityTracer = "0.6.5, 1" SparseMatrixColorings = "0.4.5" diff --git a/lib/BracketingNonlinearSolve/Project.toml b/lib/BracketingNonlinearSolve/Project.toml index fb8366065..227b84686 100644 --- a/lib/BracketingNonlinearSolve/Project.toml +++ b/lib/BracketingNonlinearSolve/Project.toml @@ -31,7 +31,7 @@ ConcreteStructs = "0.2.3" ExplicitImports = "1.10.1" ForwardDiff = "0.10.36, 1" InteractiveUtils = "<0.0.1, 1" -NonlinearSolveBase = "1.1" +NonlinearSolveBase = "1.14" PrecompileTools = "1.2" Reexport = "1.2.2" SciMLBase = "2.69" diff --git a/lib/NonlinearSolveBase/Project.toml b/lib/NonlinearSolveBase/Project.toml index b75d60463..8f8801c81 100644 --- a/lib/NonlinearSolveBase/Project.toml +++ b/lib/NonlinearSolveBase/Project.toml @@ -26,6 +26,9 @@ StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" +[sources] +SciMLJacobianOperators = {path = "../SciMLJacobianOperators"} + [weakdeps] BandedMatrices = "aae01518-5342-5314-be14-df237901396f" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -69,7 +72,7 @@ Preferences = "1.4" Printf = "1.10" RecursiveArrayTools = "3" SciMLBase = "2.92" -SciMLJacobianOperators = "0.1.1" +SciMLJacobianOperators = "0.1.8" SciMLOperators = "0.4, 1.0" SparseArrays = "1.10" SparseMatrixColorings = "0.4.5" diff --git a/lib/NonlinearSolveFirstOrder/Project.toml b/lib/NonlinearSolveFirstOrder/Project.toml index db77d67e9..0d09f821d 100644 --- a/lib/NonlinearSolveFirstOrder/Project.toml +++ b/lib/NonlinearSolveFirstOrder/Project.toml @@ -25,6 +25,7 @@ StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" [sources] NonlinearSolveBase = {path = "../NonlinearSolveBase"} +SciMLJacobianOperators = {path = "../SciMLJacobianOperators"} [compat] ADTypes = "1.9.0" @@ -47,14 +48,14 @@ LinearAlgebra = "1.10" LinearSolve = "2.36.1, 3" MaybeInplace = "0.1.4" NonlinearProblemLibrary = "0.1.2" -NonlinearSolveBase = "1.4" +NonlinearSolveBase = "1.14" Pkg = "1.10" PrecompileTools = "1.2" Random = "1.10" ReTestItems = "1.24" Reexport = "1.2.2" SciMLBase = "2.69" -SciMLJacobianOperators = "0.1.0" +SciMLJacobianOperators = "0.1.8" Setfield = "1.1.1" SparseArrays = "1.10" SparseConnectivityTracer = "0.6.8" diff --git a/lib/NonlinearSolveHomotopyContinuation/Project.toml b/lib/NonlinearSolveHomotopyContinuation/Project.toml index 8acdc6d1f..60a501b9c 100644 --- a/lib/NonlinearSolveHomotopyContinuation/Project.toml +++ b/lib/NonlinearSolveHomotopyContinuation/Project.toml @@ -16,8 +16,8 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" TaylorDiff = "b36ab563-344f-407b-a36a-4f200bebf99c" -[sources.NonlinearSolveBase] -path = "../NonlinearSolveBase" +[sources] +NonlinearSolveBase = {path = "../NonlinearSolveBase"} [compat] ADTypes = "1.11.0" @@ -30,8 +30,8 @@ Enzyme = "0.13" HomotopyContinuation = "2.12.0" LinearAlgebra = "1.10" NaNMath = "1.1" -NonlinearSolve = "4" -NonlinearSolveBase = "1.3.3" +NonlinearSolve = "4.10" +NonlinearSolveBase = "1.14" SciMLBase = "2.72.2" SymbolicIndexingInterface = "0.3.36" TaylorDiff = "0.3.1" diff --git a/lib/NonlinearSolveQuasiNewton/Project.toml b/lib/NonlinearSolveQuasiNewton/Project.toml index 82c7a4a11..0bf9f1293 100644 --- a/lib/NonlinearSolveQuasiNewton/Project.toml +++ b/lib/NonlinearSolveQuasiNewton/Project.toml @@ -21,8 +21,8 @@ StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" [weakdeps] ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" -[sources.NonlinearSolveBase] -path = "../NonlinearSolveBase" +[sources] +NonlinearSolveBase = {path = "../NonlinearSolveBase"} [extensions] NonlinearSolveQuasiNewtonForwardDiffExt = "ForwardDiff" @@ -47,7 +47,7 @@ LinearAlgebra = "1.10" LinearSolve = "2.36.1, 3" MaybeInplace = "0.1.4" NonlinearProblemLibrary = "0.1.2" -NonlinearSolveBase = "1.4" +NonlinearSolveBase = "1.14" Pkg = "1.10" PrecompileTools = "1.2" ReTestItems = "1.24" diff --git a/lib/NonlinearSolveSciPy/Project.toml b/lib/NonlinearSolveSciPy/Project.toml index 2bf56b78c..e9468aa80 100644 --- a/lib/NonlinearSolveSciPy/Project.toml +++ b/lib/NonlinearSolveSciPy/Project.toml @@ -11,14 +11,14 @@ PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -[sources.NonlinearSolveBase] -path = "../NonlinearSolveBase" +[sources] +NonlinearSolveBase = {path = "../NonlinearSolveBase"} [compat] ConcreteStructs = "0.2.3" Hwloc = "3" InteractiveUtils = "<0.0.1, 1" -NonlinearSolveBase = "1.4" +NonlinearSolveBase = "1.14" PrecompileTools = "1.2" PythonCall = "0.9" ReTestItems = "1.24" diff --git a/lib/NonlinearSolveSpectralMethods/Project.toml b/lib/NonlinearSolveSpectralMethods/Project.toml index 8fe3fcc56..6d4ce2ec1 100644 --- a/lib/NonlinearSolveSpectralMethods/Project.toml +++ b/lib/NonlinearSolveSpectralMethods/Project.toml @@ -36,7 +36,7 @@ InteractiveUtils = "<0.0.1, 1" LineSearch = "0.1.4" MaybeInplace = "0.1.4" NonlinearProblemLibrary = "0.1.2" -NonlinearSolveBase = "1.4" +NonlinearSolveBase = "1.14" Pkg = "1.10" PrecompileTools = "1.2" ReTestItems = "1.24" diff --git a/lib/SCCNonlinearSolve/Project.toml b/lib/SCCNonlinearSolve/Project.toml index 26ed1b04c..b9e1a53b8 100644 --- a/lib/SCCNonlinearSolve/Project.toml +++ b/lib/SCCNonlinearSolve/Project.toml @@ -10,6 +10,11 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" +[sources] +NonlinearSolve = {path = "../.."} +NonlinearSolveBase = {path = "../NonlinearSolveBase"} +NonlinearSolveFirstOrder = {path = "../NonlinearSolveFirstOrder"} + [compat] Aqua = "0.8" BenchmarkTools = "1.5.0" @@ -18,9 +23,9 @@ ExplicitImports = "1.5" Hwloc = "3" InteractiveUtils = "<0.0.1, 1" NonlinearProblemLibrary = "0.1.2" -NonlinearSolve = "4.8" -NonlinearSolveBase = "1.5.1" -NonlinearSolveFirstOrder = "1" +NonlinearSolve = "4.10" +NonlinearSolveBase = "1.14" +NonlinearSolveFirstOrder = "1.7" Pkg = "1.10" PrecompileTools = "1.2" ReTestItems = "1.24" diff --git a/lib/SimpleNonlinearSolve/Project.toml b/lib/SimpleNonlinearSolve/Project.toml index 0014013fb..8c29d6916 100644 --- a/lib/SimpleNonlinearSolve/Project.toml +++ b/lib/SimpleNonlinearSolve/Project.toml @@ -29,11 +29,9 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -[sources.BracketingNonlinearSolve] -path = "../BracketingNonlinearSolve" - -[sources.NonlinearSolveBase] -path = "../NonlinearSolveBase" +[sources] +BracketingNonlinearSolve = {path = "../BracketingNonlinearSolve"} +NonlinearSolveBase = {path = "../NonlinearSolveBase"} [extensions] SimpleNonlinearSolveChainRulesCoreExt = "ChainRulesCore" @@ -45,7 +43,7 @@ SimpleNonlinearSolveTrackerExt = "Tracker" ADTypes = "1.2" Aqua = "0.8.7" ArrayInterface = "7.16" -BracketingNonlinearSolve = "1.1" +BracketingNonlinearSolve = "1.3" ChainRulesCore = "1.24" CommonSolve = "0.2.4" ConcreteStructs = "0.2.3" @@ -61,7 +59,7 @@ LineSearch = "0.1.3" LinearAlgebra = "1.10" MaybeInplace = "0.1.4" NonlinearProblemLibrary = "0.1.2" -NonlinearSolveBase = "1.4" +NonlinearSolveBase = "1.14" Pkg = "1.10" PolyesterForwardDiff = "0.1.3" PrecompileTools = "1.2" diff --git a/test/runtests.jl b/test/runtests.jl index a9c5183ea..83654519f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -21,16 +21,27 @@ length(EXTRA_PKGS) ≥ 1 && Pkg.add(EXTRA_PKGS) const RETESTITEMS_NWORKERS = if GROUP == "wrappers" 0 # Sequential execution for wrapper tests else + # Ensure we have a valid default value even if Hwloc fails + default_workers = try + min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4) + catch + 1 # Fallback to 1 worker if Hwloc fails + end parse( - Int, get(ENV, "RETESTITEMS_NWORKERS", - string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4)) - ) + Int, get(ENV, "RETESTITEMS_NWORKERS", string(default_workers)) ) end const RETESTITEMS_NWORKER_THREADS = parse(Int, get( ENV, "RETESTITEMS_NWORKER_THREADS", - string(max(Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1), 1)) + string(max( + try + Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1) + catch + 1 # Fallback to 1 thread if Hwloc fails + end, + 1 + )) ) )