Skip to content

Commit 699fa6a

Browse files
committed
chore: remove unnecessary deps
1 parent 7cc3030 commit 699fa6a

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

Project.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
99
ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
1010
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1111
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
12-
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
1312
FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
1413
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
1514
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -18,6 +17,7 @@ LineSearch = "87fe0de2-c867-4266-b59a-2f0a94fc965b"
1817
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1918
LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
2019
MaybeInplace = "bb5d69b7-63fc-4a16-80bd-7e42200c7bdb"
20+
NonlinearSolveBase = "be0214bd-f91f-a760-ac4e-3421ce2b2da0"
2121
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
2222
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
2323
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -28,7 +28,6 @@ SciMLJacobianOperators = "19f34311-ddf3-4b8b-af20-060888a46c0e"
2828
SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
2929
SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
3030
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
31-
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
3231
SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35"
3332
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
3433
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
@@ -69,7 +68,6 @@ DiffEqBase = "6.155.3"
6968
DifferentiationInterface = "0.6.1"
7069
Enzyme = "0.13.2"
7170
ExplicitImports = "1.5"
72-
FastBroadcast = "0.3.5"
7371
FastClosures = "0.3.2"
7472
FastLevenbergMarquardt = "0.1"
7573
FiniteDiff = "2.24"
@@ -85,11 +83,11 @@ LinearAlgebra = "1.10"
8583
LinearSolve = "2.35"
8684
MINPACK = "1.2"
8785
MaybeInplace = "0.1.4"
88-
ModelingToolkit = "9.41.0"
8986
NLSolvers = "0.5"
9087
NLsolve = "4.5"
9188
NaNMath = "1"
9289
NonlinearProblemLibrary = "0.1.2"
90+
NonlinearSolveBase = "1"
9391
OrdinaryDiffEqTsit5 = "1.1.0"
9492
Pkg = "1.10"
9593
PrecompileTools = "1.2"
@@ -141,6 +139,7 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
141139
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
142140
ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
143141
SIAMFANLEquations = "084e46ad-d928-497d-ad5e-07fa361a48c4"
142+
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
144143
SpeedMapping = "f1835b91-879b-4a3f-a438-e4baacf14412"
145144
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
146145
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
@@ -149,4 +148,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
149148
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
150149

151150
[targets]
152-
test = ["Aqua", "BandedMatrices", "BenchmarkTools", "CUDA", "Enzyme", "ExplicitImports", "FastLevenbergMarquardt", "FixedPointAcceleration", "Hwloc", "InteractiveUtils", "LeastSquaresOptim", "LineSearches", "MINPACK", "NLSolvers", "NLsolve", "NaNMath", "NonlinearProblemLibrary", "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReTestItems", "SIAMFANLEquations", "SpeedMapping", "StableRNGs", "StaticArrays", "Sundials", "Test", "Zygote"]
151+
test = ["Aqua", "BandedMatrices", "BenchmarkTools", "CUDA", "Enzyme", "ExplicitImports", "FastLevenbergMarquardt", "FixedPointAcceleration", "Hwloc", "InteractiveUtils", "LeastSquaresOptim", "LineSearches", "MINPACK", "NLSolvers", "NLsolve", "NaNMath", "NonlinearProblemLibrary", "OrdinaryDiffEqTsit5", "Pkg", "Random", "ReTestItems", "SIAMFANLEquations", "SparseConnectivityTracer", "SpeedMapping", "StableRNGs", "StaticArrays", "Sundials", "Test", "Zygote"]

src/NonlinearSolve.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ using DiffEqBase: DiffEqBase, AbstractNonlinearTerminationMode,
1212
NormTerminationMode, RelNormTerminationMode, RelSafeBestTerminationMode,
1313
RelSafeTerminationMode, RelTerminationMode,
1414
SimpleNonlinearSolveTerminationMode, SteadyStateDiffEqTerminationMode
15-
using FastBroadcast: @..
1615
using FastClosures: @closure
1716
using LazyArrays: LazyArrays, ApplyArray, cache
1817
using LinearAlgebra: LinearAlgebra, ColumnNorm, Diagonal, I, LowerTriangular, Symmetric,
1918
UpperTriangular, axpy!, cond, diag, diagind, dot, issuccess, istril,
2019
istriu, lu, mul!, norm, pinv, tril!, triu!
2120
using LineSearch: LineSearch, AbstractLineSearchAlgorithm, AbstractLineSearchCache,
22-
NoLineSearch, RobustNonMonotoneLineSearch, BackTracking, LineSearchesJL
21+
NoLineSearch, RobustNonMonotoneLineSearch, BackTracking, LineSearchesJL,
22+
LiFukushimaLineSearch
2323
using LinearSolve: LinearSolve, LUFactorization, QRFactorization,
2424
needs_concrete_A, AbstractFactorization,
2525
DefaultAlgorithmChoice, DefaultLinearSolver
@@ -47,7 +47,6 @@ using SciMLJacobianOperators: AbstractJacobianOperator, JacobianOperator, VecJac
4747

4848
## Sparse AD Support
4949
using SparseArrays: AbstractSparseMatrix, SparseMatrixCSC
50-
using SparseConnectivityTracer: TracerSparsityDetector # This can be dropped in the next release
5150
using SparseMatrixColorings: ConstantColoringAlgorithm, GreedyColoringAlgorithm,
5251
LargestFirst
5352

@@ -182,7 +181,8 @@ export NewtonDescent, SteepestDescent, Dogleg, DampedNewtonDescent, GeodesicAcce
182181

183182
# Globalization
184183
## Line Search Algorithms
185-
export LineSearch, BackTracking, NoLineSearch, RobustNonMonotoneLineSearch, LineSearchesJL
184+
export LineSearch, BackTracking, NoLineSearch, RobustNonMonotoneLineSearch,
185+
LiFukushimaLineSearch, LineSearchesJL
186186
## Trust Region Algorithms
187187
export RadiusUpdateSchemes
188188

src/algorithms/levenberg_marquardt.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,16 @@ end
156156
@inline function __update_LM_diagonal!!(y::Diagonal, x::AbstractMatrix)
157157
if __can_setindex(y.diag)
158158
if fast_scalar_indexing(y.diag)
159-
@inbounds for i in axes(x, 1)
160-
y.diag[i] = max(y.diag[i], x[i, i])
159+
@simd for i in axes(x, 1)
160+
@inbounds y.diag[i] = max(y.diag[i], x[i, i])
161161
end
162162
return y
163163
else
164-
idxs = diagind(x)
165-
@.. broadcast=false y.diag=max(y.diag, @view(x[idxs]))
164+
y .= max.(y.diag, @view(x[diagind(x)]))
166165
return y
167166
end
168167
else
169-
idxs = diagind(x)
170-
return Diagonal(@.. broadcast=false max(y.diag, @view(x[idxs])))
168+
return Diagonal(max.(y.diag, @view(x[diagind(x)])))
171169
end
172170
end
173171

src/descent/damped_newton.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ end
226226
if __can_setindex(J_cache)
227227
copyto!(J_cache, J)
228228
if fast_scalar_indexing(J_cache)
229-
@inbounds for i in axes(J_cache, 1)
230-
J_cache[i, i] += D[i, i]
229+
@simd for i in axes(J_cache, 1)
230+
@inbounds J_cache[i, i] += D[i, i]
231231
end
232232
else
233233
idxs = diagind(J_cache)
234-
@.. broadcast=false @view(J_cache[idxs])=@view(J[idxs]) + @view(D[idxs])
234+
J_cache[idxs] .= @view(J[idxs]) .+ @view(D[idxs])
235235
end
236236
return J_cache
237237
else
@@ -242,12 +242,12 @@ end
242242
if __can_setindex(J_cache)
243243
copyto!(J_cache, J)
244244
if fast_scalar_indexing(J_cache)
245-
@inbounds for i in axes(J_cache, 1)
246-
J_cache[i, i] += D
245+
@simd for i in axes(J_cache, 1)
246+
@inbounds J_cache[i, i] += D
247247
end
248248
else
249249
idxs = diagind(J_cache)
250-
@.. broadcast=false @view(J_cache[idxs])=@view(J[idxs]) + D
250+
J_cache[idxs] .= @view(J[idxs]) .+ D
251251
end
252252
return J_cache
253253
else

src/internal/approximate_initialization.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ end
2020
function (::DiagonalStructure)(J::AbstractVector, J_new::AbstractMatrix)
2121
if __can_setindex(J)
2222
if fast_scalar_indexing(J)
23-
@inbounds for i in eachindex(J)
24-
J[i] = J_new[i, i]
23+
@simd for i in eachindex(J)
24+
@inbounds J[i] = J_new[i, i]
2525
end
2626
else
27-
@.. broadcast=false J=@view(J_new[diagind(J_new)])
27+
J .= @view(J_new[diagind(J_new)])
2828
end
2929
return J
3030
end

test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const GROUP = lowercase(get(ENV, "GROUP", "All"))
77
const EXTRA_PKGS = Pkg.PackageSpec[]
88
(GROUP == "all" || GROUP == "downstream") &&
99
push!(EXTRA_PKGS, Pkg.PackageSpec("ModelingToolkit"))
10-
Pkg.add(EXTRA_PKGS)
10+
length(EXTRA_PKGS) 1 && Pkg.add(EXTRA_PKGS)
1111

1212
const RETESTITEMS_NWORKERS = parse(
1313
Int, get(ENV, "RETESTITEMS_NWORKERS", string(min(Hwloc.num_physical_cores(), 4))))
@@ -19,4 +19,4 @@ const RETESTITEMS_NWORKER_THREADS = parse(Int,
1919

2020
ReTestItems.runtests(NonlinearSolve; tags = (GROUP == "all" ? nothing : [Symbol(GROUP)]),
2121
nworkers = RETESTITEMS_NWORKERS, nworker_threads = RETESTITEMS_NWORKER_THREADS,
22-
testitem_timeout = 3600, retries = 4)
22+
testitem_timeout = 3600)

0 commit comments

Comments
 (0)