Skip to content

Commit e332d47

Browse files
authored
Merge branch 'main' into setindex_shape_check
2 parents 57cdc07 + ce5909e commit e332d47

14 files changed

Lines changed: 356 additions & 162 deletions

File tree

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: which julia
1616
continue-on-error: true
1717
- name: Install Julia, but only if it is not already available in the PATH
18-
uses: julia-actions/setup-julia@v2
18+
uses: julia-actions/setup-julia@v3
1919
with:
2020
version: '1'
2121
arch: ${{ runner.arch }}

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
julia-version: 'nightly'
3636
steps:
3737
- uses: actions/checkout@v6
38-
- uses: julia-actions/setup-julia@v2
38+
- uses: julia-actions/setup-julia@v3
3939
with:
4040
version: ${{ matrix.julia-version }}
4141
arch: ${{ matrix.julia-arch }}
@@ -63,7 +63,7 @@ jobs:
6363
- x64
6464
steps:
6565
- uses: actions/checkout@v6
66-
- uses: julia-actions/setup-julia@v2
66+
- uses: julia-actions/setup-julia@v3
6767
with:
6868
version: ${{ matrix.julia-version }}
6969
arch: ${{ matrix.julia-arch }}
@@ -76,7 +76,7 @@ jobs:
7676
runs-on: ubuntu-latest
7777
steps:
7878
- uses: actions/checkout@v6
79-
- uses: julia-actions/setup-julia@v2
79+
- uses: julia-actions/setup-julia@v3
8080
with:
8181
version: 'nightly'
8282
- name: Generate docs

src/SparseArrays.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Base: Matrix, Vector
1919
import LinearAlgebra: mul!, ldiv!, rdiv!, cholesky, adjoint!, diag, eigen, dot,
2020
issymmetric, istril, istriu, lu, tr, transpose!, tril!, triu!, isbanded, isdiag,
2121
cond, diagm, factorize, ishermitian, norm, opnorm, lmul!, rmul!, tril, triu,
22-
matprod_dest, generic_matvecmul!, generic_matmatmul!, copytrito!
22+
matop_dest, generic_matvecmul!, generic_matmatmul!, generic_matmatmul_wrapper!, copytrito!, nonzeroinds
2323

2424
import Base: adjoint, argmin, argmax, Array, broadcast, circshift!, complex, Complex,
2525
conj, conj!, convert, copy, copy!, copyto!, count, diff, findall, findmax, findmin,
@@ -87,7 +87,7 @@ if Base.USE_GPL_LIBS
8787
include("solvers/spqr.jl")
8888
end
8989

90-
zero(a::AbstractSparseArray) = spzeros(eltype(a), size(a)...)
90+
zero(a::AbstractSparseArray{Tv,Ti}) where {Tv,Ti} = spzeros(Tv, Ti, size(a)...)
9191

9292
LinearAlgebra.diagzero(D::Diagonal{<:AbstractSparseMatrix{T}},i,j) where {T} =
9393
spzeros(T, size(D.diag[i], 1), size(D.diag[j], 2))

0 commit comments

Comments
 (0)