Skip to content

Commit 01befd0

Browse files
Merge branch 'main' into do/csc-interface-baseline
2 parents 9f3b51e + 313a04f commit 01befd0

File tree

6 files changed

+32
-39
lines changed

6 files changed

+32
-39
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,17 @@ jobs:
2424
- ubuntu-latest
2525
- windows-latest
2626
- macOS-13 # intel
27-
- macOS-14 # arm
2827
julia-arch:
2928
- x64
3029
- x86
31-
- aarch64
3230
exclude:
33-
- os: ubuntu-latest
34-
julia-arch: aarch64
35-
- os: windows-latest
36-
julia-arch: aarch64
3731
- os: macOS-13
3832
julia-arch: x86
39-
- os: macOS-13
33+
include:
34+
- os: macOS-latest
4035
julia-arch: aarch64
41-
- os: macOS-14
42-
julia-arch: x86
43-
- os: macOS-14
44-
julia-arch: x64
36+
julia-version: 'nightly'
37+
4538
steps:
4639
- uses: actions/checkout@v4
4740
- uses: julia-actions/setup-julia@v2

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Pkg = "<0.0.1, 1"
1919
Printf = "<0.0.1, 1"
2020
Random = "<0.0.1, 1"
2121
Serialization = "<0.0.1, 1"
22-
SuiteSparse_jll = "7.7.0"
22+
SuiteSparse_jll = "7.8.0"
2323
Test = "<0.0.1, 1"
2424
julia = "1.11"
2525

docs/make.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ makedocs(
88
sitename = "SparseArrays",
99
pages = Any[
1010
"SparseArrays" => "index.md",
11+
"Sparse Linear Algebra API" => "solvers.md",
1112
];
1213
warnonly = [:missing_docs, :cross_references],
1314
)

docs/src/index.md

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,17 @@ section of the standard library reference.
210210

211211
Sparse matrix solvers call functions from [SuiteSparse](http://suitesparse.com). The following factorizations are available:
212212

213+
1. [`cholesky`](@ref SparseArrays.CHOLMOD.cholesky)
214+
2. [`ldlt`](@ref SparseArrays.CHOLMOD.ldlt)
215+
3. [`lu`](@ref SparseArrays.UMFPACK.lu)
216+
4. [`qr`](@ref SparseArrays.SPQR.qr)
217+
213218
| Type | Description |
214219
|:----------------------|:--------------------------------------------- |
215220
| `CHOLMOD.Factor` | Cholesky and LDLt factorizations |
216221
| `UMFPACK.UmfpackLU` | LU factorization |
217222
| `SPQR.QRSparse` | QR factorization |
218223

219-
These factorizations are described in more detail in the [Sparse Linear Algebra API section](@ref stdlib-sparse-linalg-api):
220-
221-
1. [`cholesky`](@ref SparseArrays.CHOLMOD.cholesky)
222-
2. [`ldlt`](@ref SparseArrays.CHOLMOD.ldlt)
223-
3. [`lu`](@ref SparseArrays.UMFPACK.lu)
224-
4. [`qr`](@ref SparseArrays.SPQR.qr)
225-
226224
```@meta
227225
DocTestSetup = nothing
228226
```
@@ -267,25 +265,6 @@ SparseArrays.ftranspose!
267265
DocTestSetup = nothing
268266
```
269267

270-
# [Sparse Linear Algebra API](@id stdlib-sparse-linalg-api)
271-
272-
```@docs
273-
SparseArrays.CHOLMOD.cholesky
274-
SparseArrays.CHOLMOD.cholesky!
275-
SparseArrays.CHOLMOD.lowrankupdate
276-
SparseArrays.CHOLMOD.lowrankupdate!
277-
SparseArrays.CHOLMOD.lowrankdowndate
278-
SparseArrays.CHOLMOD.lowrankdowndate!
279-
SparseArrays.CHOLMOD.lowrankupdowndate!
280-
SparseArrays.CHOLMOD.ldlt
281-
SparseArrays.UMFPACK.lu
282-
SparseArrays.SPQR.qr
283-
```
284-
285-
```@meta
286-
DocTestSetup = nothing
287-
```
288-
289268
# Noteworthy External Sparse Packages
290269

291270
Several other Julia packages provide sparse matrix implementations that should be mentioned:

docs/src/solvers.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Sparse Linear Algebra (API)
2+
3+
```@meta
4+
DocTestSetup = :(using LinearAlgebra, SparseArrays)
5+
```
6+
7+
```@docs; canonical=false
8+
SparseArrays.CHOLMOD.cholesky
9+
SparseArrays.CHOLMOD.cholesky!
10+
SparseArrays.CHOLMOD.lowrankdowndate
11+
SparseArrays.CHOLMOD.lowrankdowndate!
12+
SparseArrays.CHOLMOD.lowrankupdowndate!
13+
SparseArrays.CHOLMOD.ldlt
14+
SparseArrays.SPQR.qr
15+
SparseArrays.UMFPACK.lu
16+
```
17+
18+
```@meta
19+
DocTestSetup = nothing
20+
```

src/solvers/spqr.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Matrix{T}(Q::QRSparseQ) where {T} = lmul!(Q, Matrix{T}(I, size(Q, 1), min(size(Q
146146

147147
# From SPQR manual p. 6
148148
_default_tol(A::AbstractSparseMatrixCSC) =
149-
20*sum(size(A))*eps(real(eltype(A)))*maximum(norm(view(A, :, i)) for i in 1:size(A, 2))
149+
20*sum(size(A))*eps()*maximum(norm(view(A, :, i)) for i in 1:size(A, 2))
150150

151151
"""
152152
qr(A::SparseMatrixCSC; tol=_default_tol(A), ordering=ORDERING_DEFAULT) -> QRSparse

0 commit comments

Comments
 (0)