Skip to content

Change 1:size to axes in bidiag mul #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2025
Merged

Change 1:size to axes in bidiag mul #1337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/bidiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ function _mul_bitrisym!(C::AbstractVecOrMat, A::Bidiagonal, B::AbstractVecOrMat,
if A.uplo == 'U'
u = A.ev
@inbounds begin
for j = 1:nB
for j in axes(B,2)
b₀, b₊ = B[1, j], B[2, j]
_modify!(_add, d[1]*b₀ + u[1]*b₊, C, (1, j))
for i = 2:nA - 1
Expand All @@ -1059,7 +1059,7 @@ function _mul_bitrisym!(C::AbstractVecOrMat, A::Bidiagonal, B::AbstractVecOrMat,
else
l = A.ev
@inbounds begin
for j = 1:nB
for j in axes(B,2)
b₀, b₊ = B[1, j], B[2, j]
_modify!(_add, d[1]*b₀, C, (1, j))
for i = 2:nA - 1
Expand All @@ -1079,7 +1079,7 @@ function _mul_bitrisym!(C::AbstractVecOrMat, A::TriSym, B::AbstractVecOrMat, _ad
d = _diag(A, 0)
u = _diag(A, 1)
@inbounds begin
for j = 1:nB
for j in axes(B,2)
b₀, b₊ = B[1, j], B[2, j]
_modify!(_add, d[1]*b₀ + u[1]*b₊, C, (1, j))
for i = 2:nA - 1
Expand Down Expand Up @@ -1118,7 +1118,7 @@ function _mul_bitrisym_right!(C::AbstractMatrix, A::AbstractMatrix, B::TriSym, _
B21 = Bl[1]
Bmm = Bd[m]
Bm₋1m = Bu[m-1]
for i in 1:n
for i in axes(A,1)
_modify!(_add, A[i,1] * B11 + A[i, 2] * B21, C, (i, 1))
_modify!(_add, A[i, m-1] * Bm₋1m + A[i, m] * Bmm, C, (i, m))
end
Expand All @@ -1127,7 +1127,7 @@ function _mul_bitrisym_right!(C::AbstractMatrix, A::AbstractMatrix, B::TriSym, _
Bj₋1j = Bu[j-1]
Bjj = Bd[j]
Bj₊1j = Bl[j]
for i = 1:n
for i in axes(A,1)
_modify!(_add, A[i, j-1] * Bj₋1j + A[i, j]*Bjj + A[i, j+1] * Bj₊1j, C, (i, j))
end
end
Expand All @@ -1148,17 +1148,17 @@ end
function _mul_bitrisym_right!(C::AbstractMatrix, A::AbstractMatrix, B::Bidiagonal, _add::MulAddMul)
m, n = size(A)
@inbounds if B.uplo == 'U'
for j in n:-1:2, i in 1:m
for j in reverse(axes(A,2)[2:end]), i in axes(A,1)
_modify!(_add, A[i,j] * B.dv[j] + A[i,j-1] * B.ev[j-1], C, (i, j))
end
for i in 1:m
for i in axes(A,1)
_modify!(_add, A[i,1] * B.dv[1], C, (i, 1))
end
else # uplo == 'L'
for j in 1:n-1, i in 1:m
for j in axes(A,2)[1:end-1], i in axes(A,1)
_modify!(_add, A[i,j] * B.dv[j] + A[i,j+1] * B.ev[j], C, (i, j))
end
for i in 1:m
for i in axes(A,1)
_modify!(_add, A[i,n] * B.dv[n], C, (i, n))
end
end
Expand Down Expand Up @@ -1235,7 +1235,7 @@ function _dibimul_nonzeroalpha!(C::AbstractMatrix, A::Diagonal, B::Bidiagonal, _
if B.uplo == 'L'
C[2,1] += _add(Ad[2]*Bev[1])
end
for col in 2:n-1
for col in axes(A,1)[2:end-1]
evrow = col+rowshift
C[evrow, col] += _add(Ad[evrow]*Bev[col - evshift])
C[col, col] += _add(Ad[col]*Bdv[col])
Expand Down Expand Up @@ -1321,7 +1321,7 @@ function dot(x::AbstractVector, B::Bidiagonal, y::AbstractVector)
@inbounds if B.uplo == 'U'
x₀ = x[1]
r = dot(x[1], dv[1], y[1])
for j in 2:nx-1
for j in eachindex(x)[2:end-1]
x₋, x₀ = x₀, x[j]
r += dot(adjoint(ev[j-1])*x₋ + adjoint(dv[j])*x₀, y[j])
end
Expand All @@ -1331,7 +1331,7 @@ function dot(x::AbstractVector, B::Bidiagonal, y::AbstractVector)
x₀ = x[1]
x₊ = x[2]
r = dot(adjoint(dv[1])*x₀ + adjoint(ev[1])*x₊, y[1])
for j in 2:nx-1
for j in eachindex(x)[2:end-1]
x₀, x₊ = x₊, x[j+1]
r += dot(adjoint(dv[j])*x₀ + adjoint(ev[j])*x₊, y[j])
end
Expand Down Expand Up @@ -1362,15 +1362,15 @@ function ldiv!(c::AbstractVecOrMat, A::Bidiagonal, b::AbstractVecOrMat)
zi = findfirst(iszero, A.dv)
isnothing(zi) || throw(SingularException(zi))

@inbounds for j in 1:nb
@inbounds for j in axes(b,2)
if A.uplo == 'L' #do colwise forward substitution
c[1,j] = bi1 = A.dv[1] \ b[1,j]
for i in 2:N
for i in eachindex(A.dv)[2:end]
c[i,j] = bi1 = A.dv[i] \ (b[i,j] - A.ev[i - 1] * bi1)
end
else #do colwise backward substitution
c[N,j] = bi1 = A.dv[N] \ b[N,j]
for i in (N - 1):-1:1
for i in reverse(eachindex(A.ev))
c[i,j] = bi1 = A.dv[i] \ (b[i,j] - A.ev[i] * bi1)
end
end
Expand Down