Skip to content

Changing support from AbstractArrays to AnyArrays for tril! and triu! functions in LinAlg + support for printarray and getproperty of QR #458

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changing support from AbstractArrays to AnyArrays for tril! and triu! functions in LinAlg + support for printarray and getproperty of QR #458

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion lib/GPUArraysCore/src/GPUArraysCore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using Adapt

export AbstractGPUArray, AbstractGPUVector, AbstractGPUMatrix, AbstractGPUVecOrMat,
WrappedGPUArray, AnyGPUArray, AbstractGPUArrayStyle,
AnyGPUArray, AnyGPUVector, AnyGPUMatrix
AnyGPUArray, AnyGPUVector, AnyGPUMatrix, AnyGPUVecOrMat

"""
AbstractGPUArray{T, N} <: DenseArray{T, N}
Expand All @@ -27,6 +27,7 @@ const WrappedGPUArray{T,N} = WrappedArray{T,N,AbstractGPUArray,AbstractGPUArray{
const AnyGPUArray{T,N} = Union{AbstractGPUArray{T,N}, WrappedGPUArray{T,N}}
const AnyGPUVector{T} = AnyGPUArray{T, 1}
const AnyGPUMatrix{T} = AnyGPUArray{T, 2}
const AnyGPUVecOrMat{T} = Union{AnyGPUArray{T, 1}, AnyGPUArray{T, 2}}


## broadcasting
Expand Down
22 changes: 20 additions & 2 deletions src/host/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ for T in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriang
@eval Base.copyto!(A::$T{T, <:AbstractGPUArray{T,N}}, B::$T{T, <:AbstractGPUArray{T,N}}) where {T,N} = $T(copyto!(parent(A), parent(B)))
end

function LinearAlgebra.tril!(A::AbstractGPUMatrix{T}, d::Integer = 0) where T
function LinearAlgebra.tril!(A::AnyGPUMatrix{T}, d::Integer = 0) where T
gpu_call(A, d; name="tril!") do ctx, _A, _d
I = @cartesianidx _A
i, j = Tuple(I)
Expand All @@ -182,7 +182,7 @@ function LinearAlgebra.tril!(A::AbstractGPUMatrix{T}, d::Integer = 0) where T
return A
end

function LinearAlgebra.triu!(A::AbstractGPUMatrix{T}, d::Integer = 0) where T
function LinearAlgebra.triu!(A::AnyGPUMatrix{T}, d::Integer = 0) where T
gpu_call(A, d; name="triu!") do ctx, _A, _d
I = @cartesianidx _A
i, j = Tuple(I)
Expand Down Expand Up @@ -795,3 +795,21 @@ function Base.isone(x::AbstractGPUMatrix{T}) where {T}

Array(y)[]
end

## QR

import LinearAlgebra: QRPackedQ

function LinearAlgebra.getproperty(F::QR{T,<:AnyGPUMatrix{T}}, d::Symbol) where {T}
m, n = size(F)
if d === :R
return triu!(view(getfield(F, :factors), 1:min(m,n), 1:n))
elseif d === :Q
return QRPackedQ(getfield(F, :factors), F.τ)
else
getfield(F, d)
end
end

Base.print_array(io::IO, Q::QRPackedQ{T,<:AnyGPUMatrix{T},<:AnyGPUMatrix{T}}) where {T} =
Base.print_array(io, collect(adapt(ToArray(), Q)))
7 changes: 7 additions & 0 deletions test/testsuite/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,10 @@ end
@test isrealfloattype(typeof(opnorm(AT(mat), p)))
end
end

@testsuite "QR" (AT, eltypes)->begin
@testset "get property" for dims in [(3,5), (3,3), (5,3)],
prop in [:Q, :R], T in eltypes
@test compare(x -> getproperty(qr(x), prop), AT, rand(T, dims))
end
end