Skip to content

(row|col)support(A, ::CartesianIndex{2}) #184

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 2 commits into
base: master
Choose a base branch
from
Open

(row|col)support(A, ::CartesianIndex{2}) #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aba1879
Update memorylayout.jl
putianyi889 Nov 27, 2023
a707be0
add tests
putianyi889 Nov 27, 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: 2 additions & 0 deletions src/memorylayout.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ gives an iterator containing the possible non-zero entries in the k-th row of A.
"""
rowsupport(A, k) = rowsupport(MemoryLayout(A), A, k)
rowsupport(A) = rowsupport(A, axes(A,1))
rowsupport(A, k::CartesianIndex{2}) = rowsupport(A, k[1])

colsupport(_, A, j) = axes(A,1)

Expand All @@ -656,6 +657,7 @@ gives an iterator containing the possible non-zero entries in the j-th column of
"""
colsupport(A, j) = colsupport(MemoryLayout(A), A, j)
colsupport(A) = colsupport(A, axes(A,2))
colsupport(A, k::CartesianIndex{2}) = rowsupport(A, k[2])

# TODO: generalise to other subarrays
function colsupport(A::SubArray{<:Any,N,<:Any,<:Tuple{Slice,AbstractVector}}, j) where N
Expand Down
2 changes: 1 addition & 1 deletion test/test_layouts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ struct FooNumber <: Number end
subdiagonaldata(Bl) == supdiagonaldata(Adjoint(Bl)) == supdiagonaldata(Transpose(Bl)) ==
T.dl

@test colsupport(T,3) == rowsupport(T,3) == colsupport(S,3) == rowsupport(S,3) == 2:4
@test colsupport(T,3) == rowsupport(T,3) == colsupport(S,3) == rowsupport(S,3) == rowsupport(T,CartesianIndex(3,2)) == colsupport(T,CartesianIndex(2,3)) == 2:4
@test colsupport(T,3:6) == rowsupport(T,3:6) == colsupport(S,3:6) == rowsupport(S,3:6) == 2:6
@test colsupport(Bl,3) == rowsupport(Bu,3) == rowsupport(Adjoint(Bl),3) == 3:4
@test rowsupport(Bl,3) == colsupport(Bu,3) == colsupport(Adjoint(Bl),3) == 2:3
Expand Down