Skip to content

Commit 7671369

Browse files
author
Avik Pal
committed
Merge branch 'main' of github.com:SciML/LinearSolve.jl into ap/adjoint
2 parents 06c09a3 + a206054 commit 7671369

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+985
-760
lines changed

.JuliaFormatter.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
style = "sciml"
22
format_markdown = true
3+
format_docstrings = true
34
annotate_untyped_fields_with_any = false

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ updates:
77
interval: "weekly"
88
ignore:
99
- dependency-name: "crate-ci/typos"
10-
update-types: ["version-update:semver-patch"]
10+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: julia-actions/setup-julia@v1
3333
with:
3434
version: ${{ matrix.version }}
35-
- uses: actions/cache@v3
35+
- uses: actions/cache@v4
3636
env:
3737
cache-name: cache-artifacts
3838
with:

.github/workflows/Downgrade.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Downgrade
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
paths-ignore:
7+
- 'docs/**'
8+
push:
9+
branches:
10+
- main
11+
paths-ignore:
12+
- 'docs/**'
13+
jobs:
14+
test:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
version: ['1']
19+
group:
20+
- Core
21+
steps:
22+
- uses: actions/checkout@v4
23+
- uses: julia-actions/setup-julia@v1
24+
with:
25+
version: ${{ matrix.version }}
26+
- uses: julia-actions/julia-downgrade-compat@v1
27+
# if: ${{ matrix.version == '1.6' }}
28+
with:
29+
skip: Pkg,TOML
30+
- uses: julia-actions/julia-buildpkg@v1
31+
- uses: julia-actions/julia-runtest@v1

.github/workflows/Downstream.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
env:
1313
GROUP: ${{ matrix.package.group }}
1414
strategy:
15+
fail-fast: false
1516
matrix:
1617
julia-version: [1]
1718
os: [ubuntu-latest]
@@ -20,7 +21,7 @@ jobs:
2021
- {user: SciML, repo: ModelingToolkit.jl, group: All}
2122
- {user: SciML, repo: SciMLSensitivity.jl, group: Core1}
2223
- {user: SciML, repo: BoundaryValueDiffEq.jl, group: All}
23-
24+
- {user: SciML, repo: NonlinearSolve.jl, group: All}
2425
steps:
2526
- uses: actions/checkout@v4
2627
- uses: julia-actions/setup-julia@v1
@@ -50,6 +51,9 @@ jobs:
5051
@info "Not compatible with this release. No problem." exception=err
5152
exit(0) # Exit immediately, as a success
5253
end
54+
env:
55+
RETESTITEMS_NWORKERS: 4
56+
RETESTITEMS_NWORKER_THREADS: 2
5357
- uses: julia-actions/julia-processcoverage@v1
5458
- uses: codecov/codecov-action@v3
5559
with:

.github/workflows/SpellCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
- name: Checkout Actions Repository
1111
uses: actions/checkout@v4
1212
- name: Check spelling
13-
uses: crate-ci/typos@v1.16.23
13+
uses: crate-ci/typos@v1.18.0

Project.toml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "LinearSolve"
22
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
33
authors = ["SciML"]
4-
version = "2.22.0"
4+
version = "2.25.0"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -22,7 +22,6 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
2222
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
2323
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
2424
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
25-
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2625
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2726
SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
2827
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
@@ -63,53 +62,53 @@ LinearSolveRecursiveArrayToolsExt = "RecursiveArrayTools"
6362
[compat]
6463
AllocCheck = "0.1"
6564
Aqua = "0.8"
66-
ArrayInterface = "7.4.11"
67-
BandedMatrices = "1"
68-
BlockDiagonals = "0.1"
65+
ArrayInterface = "7.7"
66+
BandedMatrices = "1.5"
67+
BlockDiagonals = "0.1.42"
6968
CUDA = "5"
70-
ConcreteStructs = "0.2"
71-
DocStringExtensions = "0.9"
72-
EnumX = "1"
73-
Enzyme = "0.11"
74-
EnzymeCore = "0.6"
69+
ConcreteStructs = "0.2.3"
70+
DocStringExtensions = "0.9.3"
71+
EnumX = "1.0.4"
72+
Enzyme = "0.11.15"
73+
EnzymeCore = "0.6.5"
7574
FastAlmostBandedMatrices = "0.1"
7675
FastLapackInterface = "2"
77-
FiniteDiff = "2"
78-
ForwardDiff = "0.10"
79-
GPUArraysCore = "0.1"
76+
FiniteDiff = "2.22"
77+
ForwardDiff = "0.10.36"
78+
GPUArraysCore = "0.1.6"
8079
HYPRE = "1.4.0"
81-
InteractiveUtils = "1.6"
80+
InteractiveUtils = "1.10"
8281
IterativeSolvers = "0.9.3"
83-
JET = "0.8"
84-
KLU = "0.3.0, 0.4"
85-
KernelAbstractions = "0.9"
82+
JET = "0.8.28"
83+
KLU = "0.5"
84+
KernelAbstractions = "0.9.16"
8685
Krylov = "0.9"
8786
KrylovKit = "0.6"
88-
Libdl = "1.6"
89-
LinearAlgebra = "1.9"
87+
Libdl = "1.10"
88+
LinearAlgebra = "1.10"
9089
MPI = "0.20"
9190
Metal = "0.5"
9291
MultiFloats = "1"
9392
Pardiso = "0.5"
9493
Pkg = "1"
95-
PrecompileTools = "1"
96-
Preferences = "1"
94+
PrecompileTools = "1.2"
95+
Preferences = "1.4"
9796
Random = "1"
98-
RecursiveArrayTools = "2, 3"
99-
RecursiveFactorization = "0.2.8"
97+
RecursiveArrayTools = "3.8"
98+
RecursiveFactorization = "0.2.14"
10099
Reexport = "1"
101-
Requires = "1"
102100
SafeTestsets = "0.1"
103-
SciMLBase = "2"
104-
SciMLOperators = "0.3"
101+
SciMLBase = "2.23.0"
102+
SciMLOperators = "0.3.7"
105103
Setfield = "1"
106-
SparseArrays = "1.9"
104+
SparseArrays = "1.10"
107105
Sparspak = "0.3.6"
108-
StaticArrays = "1"
109-
StaticArraysCore = "1"
106+
StableRNGs = "1"
107+
StaticArrays = "1.5"
108+
StaticArraysCore = "1.4.2"
110109
Test = "1"
111110
UnPack = "1"
112-
julia = "1.9"
111+
julia = "1.10"
113112

114113
[extras]
115114
AllocCheck = "9b6a8646-10ed-4001-bbdc-1d2f46dfbb1a"
@@ -133,8 +132,9 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
133132
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
134133
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
135134
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
135+
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
136136
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
137137
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
138138

139139
[targets]
140-
test = ["Aqua", "Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "BlockDiagonals", "Enzyme", "FiniteDiff", "BandedMatrices", "FastAlmostBandedMatrices", "StaticArrays", "AllocCheck"]
140+
test = ["Aqua", "Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "BlockDiagonals", "Enzyme", "FiniteDiff", "BandedMatrices", "FastAlmostBandedMatrices", "StaticArrays", "AllocCheck", "StableRNGs"]

benchmarks/applelu.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ algs = [
2323
GenericLUFactorization(),
2424
RFLUFactorization(),
2525
AppleAccelerateLUFactorization(),
26-
MetalLUFactorization(),
26+
MetalLUFactorization()
2727
]
2828
res = [Float32[] for i in 1:length(algs)]
2929

benchmarks/lu.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ algs = [
2424
RFLUFactorization(),
2525
MKLLUFactorization(),
2626
FastLUFactorization(),
27-
SimpleLUFactorization(),
27+
SimpleLUFactorization()
2828
]
2929
res = [Float64[] for i in 1:length(algs)]
3030

benchmarks/sparselu.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ algs = [
3636
UMFPACKFactorization(),
3737
KLUFactorization(),
3838
MKLPardisoFactorize(),
39-
SparspakFactorization(),
39+
SparspakFactorization()
4040
]
4141
cols = [:red, :blue, :green, :magenta, :turqoise] # one color per alg
4242
lst = [:dash, :solid, :dashdot] # one line style per dim
@@ -65,7 +65,8 @@ function run_and_plot(; dims = [1, 2, 3], kmax = 12)
6565
u0 = rand(rng, n)
6666

6767
for j in 1:length(algs)
68-
bt = @belapsed solve(prob, $(algs[j])).u setup=(prob = LinearProblem(copy($A),
68+
bt = @belapsed solve(prob, $(algs[j])).u setup=(prob = LinearProblem(
69+
copy($A),
6970
copy($b);
7071
u0 = copy($u0),
7172
alias_A = true,

0 commit comments

Comments
 (0)