Skip to content

remove usage of 2-arg LA.AbstractTriangular #146

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 8 commits into from
Jul 11, 2023
Merged

remove usage of 2-arg LA.AbstractTriangular #146

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
029f222
remove usage of 2-arg `LA.AbstractTriangular`
dkarrasch Jul 7, 2023
2dd86eb
fix
dkarrasch Jul 7, 2023
027e10d
another fix
dkarrasch Jul 7, 2023
2772f00
fix v1.9
dkarrasch Jul 7, 2023
e58fb41
include review comments
dkarrasch Jul 7, 2023
f963eb0
Update Project.toml
dkarrasch Jul 7, 2023
ada89d2
Update src/ArrayLayouts.jl
dkarrasch Jul 8, 2023
9c99b36
Merge branch 'master' into dk/triangular
ararslan Jul 10, 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,7 +1,7 @@
name = "ArrayLayouts"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
authors = ["Sheehan Olver <solver@mac.com>"]
version = "1.0.9"
version = "1.0.10"

[deps]
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
Expand Down
12 changes: 10 additions & 2 deletions src/ArrayLayouts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ else
const CNoPivot = NoPivot
end

if VERSION ≥ v"1.10-"
using LinearAlgebra: UpperOrLowerTriangular
else
const UpperOrLowerTriangular{T,S} = Union{LinearAlgebra.UpperTriangular{T,S},
LinearAlgebra.UnitUpperTriangular{T,S},
LinearAlgebra.LowerTriangular{T,S},
LinearAlgebra.UnitLowerTriangular{T,S}}
end

struct ApplyBroadcastStyle <: BroadcastStyle end
@inline function copyto!(dest::AbstractArray, bc::Broadcasted{ApplyBroadcastStyle})
Expand Down Expand Up @@ -148,7 +156,7 @@ end
macro layoutgetindex(Typ)
esc(quote
ArrayLayouts.@_layoutgetindex $Typ
ArrayLayouts.@_layoutgetindex LinearAlgebra.AbstractTriangular{<:Any,<:$Typ}
ArrayLayouts.@_layoutgetindex ArrayLayouts.UpperOrLowerTriangular{<:Any,<:$Typ}
ArrayLayouts.@_layoutgetindex LinearAlgebra.Symmetric{<:Any,<:$Typ}
ArrayLayouts.@_layoutgetindex LinearAlgebra.Hermitian{<:Any,<:$Typ}
ArrayLayouts.@_layoutgetindex LinearAlgebra.Adjoint{<:Any,<:$Typ}
Expand Down Expand Up @@ -358,7 +366,7 @@ Base.replace_in_print_matrix(A::Union{LayoutVector,
Base.print_matrix_row(io::IO,
X::Union{LayoutMatrix,
LayoutVector,
AbstractTriangular{<:Any,<:LayoutMatrix},
UpperOrLowerTriangular{<:Any,<:LayoutMatrix},
AdjOrTrans{<:Any,<:LayoutMatrix},
AdjOrTrans{<:Any,<:LayoutVector},
HermOrSym{<:Any,<:LayoutMatrix},
Expand Down
4 changes: 2 additions & 2 deletions src/memorylayout.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ end

axes(A::HermOrSym{<:Any,<:LayoutMatrix}) = _sym_axes(A)
axes(A::HermOrSym{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = _sym_axes(A)
axes(A::AbstractTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
axes(A::AbstractTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))
axes(A::UpperOrLowerTriangular{<:Any,<:LayoutMatrix}) = axes(parent(A))
axes(A::UpperOrLowerTriangular{<:Any,<:SubArray{<:Any,2,<:LayoutMatrix}}) = axes(parent(A))

function axes(D::Diagonal{<:Any,<:LayoutVector})
a = axes(parent(D),1)
Expand Down