Skip to content

sub_materialize axes and fill #152

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

sub_materialize axes and fill #152

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
72f0f16
sum_materialize axes and fill
dlfivefifty Dec 22, 2019
d574f80
Update gbmm.jl
dlfivefifty Jan 1, 2020
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
1 change: 1 addition & 0 deletions src/banded/BandedMatrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ const BandedSubBandedMatrix{T, C, R, I1<:AbstractUnitRange, I2<:AbstractUnitRang
isbanded(::BandedSubBandedMatrix) = true
sublayout(::BandedColumns{L}, ::Type{<:Tuple{AbstractUnitRange,J}}) where {L,J<:AbstractUnitRange} =
bandedcolumns(sublayout(L(),Tuple{Slice{OneTo{Int}},J}))
getindex_value(A::SubArray) = getindex_value(parent(A))
BroadcastStyle(::Type{<:BandedSubBandedMatrix}) = BandedStyle()

function _shift(bm::BandedSubBandedMatrix)
Expand Down
2 changes: 2 additions & 0 deletions src/banded/gbmm.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ function gbmm!(tA::Char, tB::Char, α::T, A::AbstractMatrix{T}, B::AbstractMatri
@assert ν == size(B,1)
@assert m == size(C,2)

(n == 0 || ν == 0 || m == 0) && return C

Al, Au = bandwidths(A)
Bl, Bu = bandwidths(B)
C̃l, C̃u = bandwidths(C)
Expand Down
2 changes: 1 addition & 1 deletion src/generic/indexing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ inbands_setindex!(x::Transpose, v, i::Integer, j::Integer) =
# on the memory layout
###

sub_materialize(::AbstractBandedLayout, V) = BandedMatrix(V)
sub_materialize(::AbstractBandedLayout, V, _) = BandedMatrix(V)

@inline getindex(A::AbstractBandedMatrix, kr::Colon, jr::Colon) = lazy_getindex(A, kr, jr)
@inline getindex(A::AbstractBandedMatrix, kr::Colon, jr::AbstractUnitRange) = lazy_getindex(A, kr, jr)
Expand Down