Skip to content

Commit 57cdc07

Browse files
authored
Merge branch 'main' into setindex_shape_check
2 parents 73a8ef0 + 3ab784c commit 57cdc07

21 files changed

Lines changed: 630 additions & 308 deletions

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ jobs:
3030
- os: macOS-latest
3131
julia-arch: aarch64
3232
julia-version: 'nightly'
33-
- os: macOS-13
33+
- os: macOS-15-intel
3434
julia-arch: x64
3535
julia-version: 'nightly'
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3838
- uses: julia-actions/setup-julia@v2
3939
with:
4040
version: ${{ matrix.julia-version }}
4141
arch: ${{ matrix.julia-arch }}
42-
- uses: julia-actions/cache@v2
42+
- uses: julia-actions/cache@v3
4343
- uses: julia-actions/julia-buildpkg@v1
4444
- uses: julia-actions/julia-runtest@v1
4545
- uses: julia-actions/julia-processcoverage@v1
46-
- uses: codecov/codecov-action@v5
46+
- uses: codecov/codecov-action@v6
4747
with:
4848
file: lcov.info
4949
token: ${{ secrets.CODECOV_TOKEN }}
@@ -62,20 +62,20 @@ jobs:
6262
julia-arch:
6363
- x64
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
- uses: julia-actions/setup-julia@v2
6767
with:
6868
version: ${{ matrix.julia-version }}
6969
arch: ${{ matrix.julia-arch }}
70-
- uses: julia-actions/cache@v2
70+
- uses: julia-actions/cache@v3
7171
- uses: julia-actions/julia-buildpkg@v1
7272
- uses: julia-actions/julia-runtest@v1
7373
env:
7474
SPARSEARRAYS_AQUA_TEST: true
7575
docs:
7676
runs-on: ubuntu-latest
7777
steps:
78-
- uses: actions/checkout@v4
78+
- uses: actions/checkout@v6
7979
- uses: julia-actions/setup-julia@v2
8080
with:
8181
version: 'nightly'

gen/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
44
SuiteSparse_jll = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
55

66
[compat]
7-
Clang = "0.18"
8-
JuliaFormatter = "1.0.45"
7+
Clang = "0.18, 0.19"
8+
JuliaFormatter = "2"

gen/generator.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ else
2222
end
2323
include_dir = joinpath(artifact_dir, "include", "suitesparse") |> normpath
2424

25+
config_h = joinpath(include_dir, "SuiteSparse_config.h")
26+
@assert isfile(config_h)
27+
2528
cholmod_h = joinpath(include_dir, "cholmod.h")
2629
@assert isfile(cholmod_h)
2730

@@ -42,7 +45,7 @@ options["general"]["output_file_path"] = joinpath(@__DIR__, "..", "src/solvers/w
4245
args = get_default_args()
4346
push!(args, "-I$include_dir")
4447

45-
header_files = [cholmod_h, SuiteSparseQR_C_h, umfpack_h]
48+
header_files = [config_h, cholmod_h, SuiteSparseQR_C_h, umfpack_h]
4649

4750
ctx = create_context(header_files, args, options)
4851

src/SparseArrays.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using LinearAlgebra: AdjOrTrans, AdjointFactorization, TransposeFactorization, m
1717
import Base: +, -, *, \, /, ==, zero
1818
import Base: Matrix, Vector
1919
import LinearAlgebra: mul!, ldiv!, rdiv!, cholesky, adjoint!, diag, eigen, dot,
20-
issymmetric, istril, istriu, lu, tr, transpose!, tril!, triu!, isbanded,
20+
issymmetric, istril, istriu, lu, tr, transpose!, tril!, triu!, isbanded, isdiag,
2121
cond, diagm, factorize, ishermitian, norm, opnorm, lmul!, rmul!, tril, triu,
2222
matprod_dest, generic_matvecmul!, generic_matmatmul!, copytrito!
2323

@@ -35,6 +35,8 @@ export AbstractSparseArray, AbstractSparseMatrix, AbstractSparseVector,
3535
sprand, sprandn, spzeros, nnz, permute, findnz, fkeep!, ftranspose!,
3636
sparse_hcat, sparse_vcat, sparse_hvcat
3737

38+
public sparse!, spzeros!
39+
3840
const LinAlgLeftQs = Union{HessenbergQ,QRCompactWYQ,QRPackedQ}
3941

4042
# helper function needed in sparsematrix, sparsevector and higherorderfns

src/higherorderfns.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const SpBroadcasted2{Style<:SPVM,Axes,F,Args<:Tuple{SparseVecOrMat,SparseVecOrMa
121121
@inline columns(A::AbstractCompressedVector) = 1
122122
@inline columns(A::AbstractSparseMatrixCSC) = axes(A,2)
123123
@inline colrange(A::AbstractCompressedVector, j) = 1:length(nonzeroinds(A))
124-
@inline colrange(A::AbstractSparseMatrixCSC, j) = nzrange(A, j)
124+
Base.@propagate_inbounds colrange(A::AbstractSparseMatrixCSC, j) = nzrange(A, j)
125125
@inline colstartind(A::AbstractCompressedVector, j) = one(indtype(A))
126126
@inline colboundind(A::AbstractCompressedVector, j) = convert(indtype(A), length(nonzeroinds(A)) + 1)
127127
@inline colstartind(A::AbstractSparseMatrixCSC, j) = getcolptr(A)[j]

0 commit comments

Comments
 (0)