Skip to content

Specialize Diagonal * Adjoint #1207

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 17 commits into from
Feb 20, 2025
Merged

Specialize Diagonal * Adjoint #1207

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
52b76f0
Specialize Diagonal * Adjoint
jishnub Feb 14, 2025
c0829bb
Get wrapper type from array
jishnub Feb 14, 2025
ea6b1b8
Specialize Diagonal * Adjoint
jishnub Feb 14, 2025
7b639c6
Get wrapper type from array
jishnub Feb 14, 2025
8879f8c
Add a special path for strided matrices
jishnub Feb 19, 2025
7dfba0c
Restrict strided methods to `Number`
jishnub Feb 20, 2025
37f4547
Restrict `Diagonal` to Number as well in strided methods
jishnub Feb 20, 2025
640bc84
Use `matprod_dest` to obtain destination
jishnub Feb 20, 2025
a51c91d
Call `mul!` instead of `lmul!`/`rmul!`
jishnub Feb 20, 2025
3552384
Restore earlier behavior
jishnub Feb 20, 2025
23d0e50
Add a special path for strided matrices
jishnub Feb 19, 2025
35a3df2
Use `matprod_dest` to obtain destination
jishnub Feb 20, 2025
2190a61
Invoke generic multiplication in strided case
jishnub Feb 20, 2025
d719b46
Merge branch 'master' into jishnub/adj_diag_mul
dkarrasch Feb 20, 2025
c54949c
dispatch by `mul`
dkarrasch Feb 20, 2025
33d8a96
Revert "dispatch by `mul`"
dkarrasch Feb 20, 2025
cf94706
Restore `__muldiag_nonzeroalpha_right!`
jishnub Feb 20, 2025
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
4 changes: 2 additions & 2 deletions src/adjtrans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,8 @@ const AdjointAbsVec{T} = Adjoint{T,<:AbstractVector}
const AdjointAbsMat{T} = Adjoint{T,<:AbstractMatrix}
const TransposeAbsVec{T} = Transpose{T,<:AbstractVector}
const TransposeAbsMat{T} = Transpose{T,<:AbstractMatrix}
const AdjOrTransAbsVec{T} = AdjOrTrans{T,<:AbstractVector}
const AdjOrTransAbsMat{T} = AdjOrTrans{T,<:AbstractMatrix}
const AdjOrTransAbsVec{T,V<:AbstractVector} = AdjOrTrans{T,V}
const AdjOrTransAbsMat{T,M<:AbstractMatrix} = AdjOrTrans{T,M}

# for internal use below
wrapperop(_) = identity
Expand Down
26 changes: 26 additions & 0 deletions src/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,32 @@ function (*)(D::Diagonal, V::AbstractVector)
return D.diag .* V
end

function _diag_adj_mul(A::AdjOrTransAbsMat, D::Diagonal)
adj = wrapperop(A)
copy(adj(adj(D) * adj(A)))
end
function _diag_adj_mul(A::AdjOrTransAbsMat{<:Number, <:StridedMatrix}, D::Diagonal{<:Number})
TS = promote_op(matprod, eltype(A), eltype(D))
C = matprod_dest(A, D, TS)
mul!(C, A, D)
end
function _diag_adj_mul(D::Diagonal, A::AdjOrTransAbsMat)
adj = wrapperop(A)
copy(adj(adj(A) * adj(D)))
end
function _diag_adj_mul(D::Diagonal{<:Number}, A::AdjOrTransAbsMat{<:Number, <:StridedMatrix})
TS = promote_op(matprod, eltype(A), eltype(D))
C = matprod_dest(D, A, TS)
mul!(C, D, A)
end

function (*)(A::AdjOrTransAbsMat, D::Diagonal)
_diag_adj_mul(A, D)
end
function (*)(D::Diagonal, A::AdjOrTransAbsMat)
_diag_adj_mul(D, A)
end

function rmul!(A::AbstractMatrix, D::Diagonal)
matmul_size_check(size(A), size(D))
for I in CartesianIndices(A)
Expand Down