Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions src/host/linalg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ function LinearAlgebra.mul!(C::Diagonal{<:Any, <:AbstractGPUArray},
end

function LinearAlgebra.mul!(C::Diagonal{<:Any, <:AbstractGPUArray},
A::AbstractGPUArray,
B::AbstractGPUArray)
A::Union{AbstractGPUArray, Adjoint{T,<:AbstractGPUArray{T}}, Transpose{T,<:AbstractGPUArray{T}}},
B::Union{AbstractGPUArray, Adjoint{T,<:AbstractGPUArray{T}}, Transpose{T,<:AbstractGPUArray{T}}}) where {T}
dc = C.diag
d = length(dc)
m, n = size(A, 1), size(A, 2)
Expand All @@ -282,23 +282,22 @@ end

function LinearAlgebra.mul!(B::AbstractGPUVecOrMat,
D::Diagonal{<:Any, <:AbstractGPUArray},
A::AbstractGPUVecOrMat)
A::Union{AbstractGPUArray, Adjoint{T,<:AbstractGPUArray{T}}, Transpose{T,<:AbstractGPUArray{T}}}) where {T}
dd = D.diag
d = length(dd)
m, n = size(A, 1), size(A, 2)
m′, n′ = size(B, 1), size(B, 2)
m == d || throw(DimensionMismatch("right hand side has $m rows but D is $d by $d"))
(m, n) == (m′, n′) || throw(DimensionMismatch("expect output to be $m by $n, but got $m′ by $n′"))
@. B = dd * A

B
end

function LinearAlgebra.mul!(B::AbstractGPUVecOrMat,
D::Diagonal{<:Any, <:AbstractGPUArray},
A::AbstractGPUVecOrMat,
A::Union{AbstractGPUArray, Adjoint{T,<:AbstractGPUArray{T}}, Transpose{T,<:AbstractGPUArray{T}}},
α::Number,
β::Number)
β::Number) where {T}
dd = D.diag
d = length(dd)
m, n = size(A, 1), size(A, 2)
Expand Down
8 changes: 8 additions & 0 deletions test/testsuite/linalg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@
mul!(X, D, B)
mul!(Y, Diagonal(collect(d)), collect(B))
@test collect(X) ≈ Y
mul!(X, D, adjoint(B))
mul!(Y, Diagonal(collect(d)), collect(adjoint(B)))
@test collect(X) ≈ Y
mul!(X, D, B, α, β)
mul!(Y, Diagonal(collect(d)), collect(B), α, β)
@test collect(X) ≈ Y
Expand All @@ -259,6 +262,11 @@
C = Diagonal(d)
mul!(C, a, b)
@test collect(C) ≈ Diagonal(collect(a) * collect(b))
a = transpose(AT(diagm(rand(elty, n))))
b = adjoint(AT(diagm(rand(elty, n))))
C = Diagonal(d)
mul!(C, a, b)
@test collect(C) ≈ Diagonal(collect(a) * collect(b))
end
end

Expand Down
Loading