Skip to content

Replace AbstractTriangular by union #1146

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
mateuszbaran merged 5 commits into from
Apr 11, 2023
Merged

Replace AbstractTriangular by union #1146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
681afb8
Replace AbstractTriangular by union
dkarrasch Mar 25, 2023
057716d
test on v1.6 & v1
dkarrasch Mar 26, 2023
362594a
Keep testing on Julia v1.0
dkarrasch Mar 28, 2023
e784dea
adjust tests
dkarrasch Apr 9, 2023
c7cf2ac
fix core test
dkarrasch Apr 9, 2023
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "StaticArrays"
uuid = "90137ffa-7385-5640-81b9-e52037218182"
version = "0.12.5"
version = "0.12.6"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand Down
4 changes: 0 additions & 4 deletions src/lu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ function _first_zero_on_diagonal(A::StaticMatrix{M,N,T}) where {M,N,T}
end
end

function _first_zero_on_diagonal(A::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix})
_first_zero_on_diagonal(A.data)
end

issuccess(F::LU) = _first_zero_on_diagonal(F.U) == 0

@generated function _lu(A::StaticMatrix{M,N,T}, pivot, check) where {M,N,T}
Expand Down
5 changes: 4 additions & 1 deletion src/traits.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ Size(::Type{Transpose{T, A}}) where {T, A <: AbstractVecOrMat{T}} = Size(Size(A)
Size(::Type{Symmetric{T, A}}) where {T, A <: AbstractMatrix{T}} = Size(A)
Size(::Type{Hermitian{T, A}}) where {T, A <: AbstractMatrix{T}} = Size(A)
Size(::Type{Diagonal{T, A}}) where {T, A <: AbstractVector{T}} = Size(Size(A)[1], Size(A)[1])
Size(::Type{<:LinearAlgebra.AbstractTriangular{T, A}}) where {T,A} = Size(A)
Size(::Type{UpperTriangular{T, A}}) where {T,A} = Size(A)
Size(::Type{UnitUpperTriangular{T, A}}) where {T,A} = Size(A)
Size(::Type{LowerTriangular{T, A}}) where {T,A} = Size(A)
Size(::Type{UnitLowerTriangular{T, A}}) where {T,A} = Size(A)

@pure Size(::Type{<:AbstractArray{<:Any, N}}) where {N} = Size(ntuple(_ -> Dynamic(), N))

Expand Down
20 changes: 12 additions & 8 deletions src/triangular.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
const StaticULT = Union{UpperTriangular{<:Any,<:StaticMatrix},LowerTriangular{<:Any,<:StaticMatrix}}
const StaticUULT = Union{StaticULT,UnitUpperTriangular{<:Any,<:StaticMatrix},UnitLowerTriangular{<:Any,<:StaticMatrix}}

@inline transpose(A::LinearAlgebra.LowerTriangular{<:Any,<:StaticMatrix}) =
LinearAlgebra.UpperTriangular(transpose(A.data))
@inline adjoint(A::LinearAlgebra.LowerTriangular{<:Any,<:StaticMatrix}) =
Expand All @@ -6,22 +9,23 @@
LinearAlgebra.LowerTriangular(transpose(A.data))
@inline adjoint(A::LinearAlgebra.UpperTriangular{<:Any,<:StaticMatrix}) =
LinearAlgebra.LowerTriangular(adjoint(A.data))
@inline Base.:*(A::Adjoint{<:Any,<:StaticVecOrMat}, B::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}) =
@inline Base.:*(A::Adjoint{<:Any,<:StaticVecOrMat}, B::StaticUULT) =
adjoint(adjoint(B) * adjoint(A))
@inline Base.:*(A::Transpose{<:Any,<:StaticVecOrMat}, B::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}) =
@inline Base.:*(A::Transpose{<:Any,<:StaticVecOrMat}, B::StaticUULT) =
transpose(transpose(B) * transpose(A))
@inline Base.:*(A::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}, B::Adjoint{<:Any,<:StaticVecOrMat}) =
@inline Base.:*(A::StaticUULT, B::Adjoint{<:Any,<:StaticVecOrMat}) =
adjoint(adjoint(B) * adjoint(A))
@inline Base.:*(A::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}, B::Transpose{<:Any,<:StaticVecOrMat}) =
@inline Base.:*(A::StaticUULT, B::Transpose{<:Any,<:StaticVecOrMat}) =
transpose(transpose(B) * transpose(A))

const StaticULT = Union{UpperTriangular{<:Any,<:StaticMatrix},LowerTriangular{<:Any,<:StaticMatrix}}

@inline Base.:*(A::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticVecOrMat) = _A_mul_B(Size(A), Size(B), A, B)
@inline Base.:*(A::StaticVecOrMat, B::LinearAlgebra.AbstractTriangular{<:Any,<:StaticMatrix}) = _A_mul_B(Size(A), Size(B), A, B)
@inline Base.:*(A::StaticUULT, B::StaticVecOrMat) = _A_mul_B(Size(A), Size(B), A, B)
@inline Base.:*(A::StaticVecOrMat, B::StaticUULT) = _A_mul_B(Size(A), Size(B), A, B)
@inline Base.:*(A::StaticULT, B::StaticULT) = _A_mul_B(Size(A), Size(B), A, B)
@inline Base.:\(A::StaticULT, B::StaticVecOrMat) = _A_ldiv_B(Size(A), Size(B), A, B)

function _first_zero_on_diagonal(A::StaticUULT)
_first_zero_on_diagonal(A.data)
end

@generated function _A_mul_B(::Size{sa}, ::Size{sb}, A::UpperTriangular{TA,<:StaticMatrix}, B::StaticVecOrMat{TB}) where {sa,sb,TA,TB}
m = sb[1]
Expand Down