Skip to content

Fix subpackage source definitions and test parsing errors #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Fix subpackage source definitions and test parsing errors #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b8ec392
Fix subpackage source definitions and update compat entries
ChrisRackauckas Aug 11, 2025
35e4031
Fix: Don't add new deps to SCCNonlinearSolve
ChrisRackauckas Aug 11, 2025
630390d
Apply suggestions from code review
ChrisRackauckas Aug 11, 2025
131ff14
Fix: Revert sublibrary version bumps to latest release versions
ChrisRackauckas Aug 11, 2025
d3c7053
Apply suggestions from code review
ChrisRackauckas Aug 11, 2025
14c4522
Update lib/NonlinearSolveHomotopyContinuation/Project.toml
ChrisRackauckas Aug 11, 2025
c298b76
Update lib/SCCNonlinearSolve/Project.toml
ChrisRackauckas Aug 11, 2025
2e77f2e
Update Project.toml
ChrisRackauckas Aug 11, 2025
d6fb00e
Update lib/SCCNonlinearSolve/Project.toml
ChrisRackauckas Aug 11, 2025
ee49e88
Merge branch 'master' into pr-674
ChrisRackauckas Aug 11, 2025
714ead6
Fix sources section format in subpackage Project.toml files
claude Aug 18, 2025
96bd19e
Fix parse error in runtests.jl when Hwloc fails
claude Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/BracketingNonlinearSolve/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion lib/NonlinearSolveBase/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions lib/NonlinearSolveFirstOrder/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"

[sources]
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
SciMLJacobianOperators = {path = "../SciMLJacobianOperators"}

[compat]
ADTypes = "1.9.0"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions lib/NonlinearSolveHomotopyContinuation/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions lib/NonlinearSolveQuasiNewton/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions lib/NonlinearSolveSciPy/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/NonlinearSolveSpectralMethods/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 8 additions & 3 deletions lib/SCCNonlinearSolve/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
12 changes: 5 additions & 7 deletions lib/SimpleNonlinearSolve/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
19 changes: 15 additions & 4 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
))
)
)

Expand Down
Loading