Skip to content

Commit 1036cbb

Browse files
Merge pull request #577 from SciML/rat
Make RAT a hard dep
2 parents 227c34b + f172672 commit 1036cbb

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

Project.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
1919
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
2020
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
2121
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
22+
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
2223
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2324
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2425
SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
@@ -41,7 +42,6 @@ KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
4142
KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
4243
Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
4344
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
44-
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
4545
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
4646
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
4747

@@ -59,7 +59,6 @@ LinearSolveKernelAbstractionsExt = "KernelAbstractions"
5959
LinearSolveKrylovKitExt = "KrylovKit"
6060
LinearSolveMetalExt = "Metal"
6161
LinearSolvePardisoExt = "Pardiso"
62-
LinearSolveRecursiveArrayToolsExt = "RecursiveArrayTools"
6362
LinearSolveRecursiveFactorizationExt = "RecursiveFactorization"
6463
LinearSolveSparseArraysExt = "SparseArrays"
6564
LinearSolveSparspakExt = "Sparspak"

ext/LinearSolveRecursiveArrayToolsExt.jl

-12
This file was deleted.

src/LinearSolve.jl

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ using EnumX
1919
using Markdown
2020
using ChainRulesCore
2121
import InteractiveUtils
22+
import RecursiveArrayTools
2223

2324
import StaticArraysCore: StaticArray, SVector, MVector, SMatrix, MMatrix
2425

src/iterative_wrappers.jl

+6
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,12 @@ function init_cacheval(alg::KrylovJL, A, b, u, Pl, Pr, maxiters::Int, abstol, re
237237
return solver
238238
end
239239

240+
# Krylov.jl tries to init with `ArrayPartition(undef, ...)`. Avoid hitting that!
241+
function init_cacheval(alg::LinearSolve.KrylovJL, A, b::RecursiveArrayTools.ArrayPartition, u, Pl, Pr,
242+
maxiters::Int, abstol, reltol, verbose::Bool, ::LinearSolve.OperatorAssumptions)
243+
return nothing
244+
end
245+
240246
function SciMLBase.solve!(cache::LinearCache, alg::KrylovJL; kwargs...)
241247
if cache.precsisfresh && !isnothing(alg.precs)
242248
Pl, Pr = alg.precs(cache.A, cache.p)

0 commit comments

Comments
 (0)