diff --git a/Project.toml b/Project.toml index 6e897bae3..cf4f48553 100644 --- a/Project.toml +++ b/Project.toml @@ -26,7 +26,6 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7" -SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" @@ -45,6 +44,14 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SpeedMapping = "f1835b91-879b-4a3f-a438-e4baacf14412" Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4" +[sources] +BracketingNonlinearSolve = {path = "lib/BracketingNonlinearSolve"} +NonlinearSolveBase = {path = "lib/NonlinearSolveBase"} +NonlinearSolveFirstOrder = {path = "lib/NonlinearSolveFirstOrder"} +NonlinearSolveQuasiNewton = {path = "lib/NonlinearSolveQuasiNewton"} +NonlinearSolveSpectralMethods = {path = "lib/NonlinearSolveSpectralMethods"} +SimpleNonlinearSolve = {path = "lib/SimpleNonlinearSolve"} + [extensions] NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt" NonlinearSolveFixedPointAccelerationExt = "FixedPointAcceleration" @@ -142,6 +149,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823" SIAMFANLEquations = "084e46ad-d928-497d-ad5e-07fa361a48c4" SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" +SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35" SpeedMapping = "f1835b91-879b-4a3f-a438-e4baacf14412" StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" @@ -149,24 +157,5 @@ Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" -[sources.BracketingNonlinearSolve] -path = "lib/BracketingNonlinearSolve" - -[sources.NonlinearSolveBase] -path = "lib/NonlinearSolveBase" - -[sources.NonlinearSolveFirstOrder] -path = "lib/NonlinearSolveFirstOrder" - -[sources.NonlinearSolveQuasiNewton] -path = "lib/NonlinearSolveQuasiNewton" - -[sources.NonlinearSolveSpectralMethods] -path = "lib/NonlinearSolveSpectralMethods" - -[sources.SimpleNonlinearSolve] -path = "lib/SimpleNonlinearSolve" - [targets] -test = ["Aqua", "BandedMatrices", "BenchmarkTools", "CUDA", "ExplicitImports", "FastLevenbergMarquardt", "FixedPointAcceleration", "Hwloc", "InteractiveUtils", "LeastSquaresOptim", "LineSearches", "MINPACK", "NLSolvers", "NLsolve", "NaNMath", "NonlinearProblemLibrary", "OrdinaryDiffEqTsit5", "PETSc", "Pkg", "PolyesterForwardDiff", "Random", "ReTestItems", "SIAMFANLEquations", "SparseConnectivityTracer", "SpeedMapping", "StableRNGs", "StaticArrays", "Sundials", "Test", "Zygote"] - +test = ["Aqua", "BandedMatrices", "BenchmarkTools", "CUDA", "ExplicitImports", "FastLevenbergMarquardt", "FixedPointAcceleration", "Hwloc", "InteractiveUtils", "LeastSquaresOptim", "LineSearches", "MINPACK", "NLSolvers", "NLsolve", "NaNMath", "NonlinearProblemLibrary", "OrdinaryDiffEqTsit5", "PETSc", "Pkg", "PolyesterForwardDiff", "Random", "ReTestItems", "SIAMFANLEquations", "SparseConnectivityTracer", "SparseMatrixColorings", "SpeedMapping", "StableRNGs", "StaticArrays", "Sundials", "Test", "Zygote"] diff --git a/src/NonlinearSolve.jl b/src/NonlinearSolve.jl index e7bbf82b2..8eddf0712 100644 --- a/src/NonlinearSolve.jl +++ b/src/NonlinearSolve.jl @@ -30,9 +30,6 @@ using SimpleNonlinearSolve: SimpleBroyden, SimpleKlement using FiniteDiff: FiniteDiff # Default Finite Difference Method using ForwardDiff: ForwardDiff, Dual # Default Forward Mode AD -# Sparse AD Support: Implemented via extensions in NonlinearSolveBase -using SparseMatrixColorings: SparseMatrixColorings - # Sub-Packages that are re-exported by NonlinearSolve using BracketingNonlinearSolve: BracketingNonlinearSolve using LineSearch: LineSearch diff --git a/test/runtests.jl b/test/runtests.jl index a9c5183ea..dcfb869ff 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -21,18 +21,15 @@ length(EXTRA_PKGS) ≥ 1 && Pkg.add(EXTRA_PKGS) const RETESTITEMS_NWORKERS = if GROUP == "wrappers" 0 # Sequential execution for wrapper tests else - parse( - Int, get(ENV, "RETESTITEMS_NWORKERS", - string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4)) - ) - ) + tmp = get(ENV, "RETESTITEMS_NWORKERS", "") + isempty(tmp) && (tmp = string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4))) + parse(Int, tmp) +end +const RETESTITEMS_NWORKER_THREADS = begin + tmp = get(ENV, "RETESTITEMS_NWORKER_THREADS", "") + isempty(tmp) && (tmp = string(max(Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1), 1))) + parse(Int, tmp) end -const RETESTITEMS_NWORKER_THREADS = parse(Int, - get( - ENV, "RETESTITEMS_NWORKER_THREADS", - string(max(Hwloc.num_virtual_cores() ÷ max(RETESTITEMS_NWORKERS, 1), 1)) - ) -) @info "Running tests for group: $(GROUP) with $(RETESTITEMS_NWORKERS) workers"