Skip to content
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

Call functions instead of field access for BlockedUnitRange #338

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Call functions instead of field access for BlockedUnitRange #338

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
0a1e174
Call functions instead of field access for BlockedUnitRange
jishnub Mar 20, 2024
c0143fe
Add tests for Zeros
jishnub Mar 20, 2024
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
36 changes: 18 additions & 18 deletions src/blockaxis.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,21 @@ BlockedUnitRange(::BlockedUnitRange) = throw(ArgumentError("Forbidden due to amb
_blocklengths2blocklasts(blocks) = cumsum(blocks) # extra level to allow changing default cumsum behaviour
@inline blockedrange(blocks::Union{Tuple,AbstractVector}) = _BlockedUnitRange(_blocklengths2blocklasts(blocks))

@inline blockfirsts(a::BlockedUnitRange) = [a.first; @views(a.lasts[1:end-1]) .+ 1]
@inline blockfirsts(a::BlockedUnitRange) = [first(a); @views(blocklasts(a)[1:end-1]) .+ 1]
# optimize common cases
@inline function blockfirsts(a::BlockedUnitRange{<:Union{Vector, RangeCumsum{<:Any, <:UnitRange}}})
v = Vector{eltype(a)}(undef, length(a.lasts))
v[1] = a.first
v[2:end] .= @views(a.lasts[oneto(end-1)]) .+ 1
v = Vector{eltype(a)}(undef, length(blocklasts(a)))
v[1] = first(a)
v[2:end] .= @views(blocklasts(a)[oneto(end-1)]) .+ 1
return v
end
@inline blocklasts(a::BlockedUnitRange) = a.lasts

_diff(a::AbstractVector) = diff(a)
_diff(a::Tuple) = diff(collect(a))
@inline blocklengths(a::BlockedUnitRange) = isempty(a.lasts) ? [_diff(a.lasts);] : [first(a.lasts)-a.first+1; _diff(a.lasts)]
@inline blocklengths(a::BlockedUnitRange) = isempty(blocklasts(a)) ? [_diff(blocklasts(a));] : [first(blocklasts(a))-first(a)+1; _diff(blocklasts(a))]

length(a::BlockedUnitRange) = isempty(a.lasts) ? 0 : Integer(last(a.lasts)-a.first+1)
length(a::BlockedUnitRange) = isempty(blocklasts(a)) ? 0 : Integer(last(blocklasts(a))-first(a)+1)

"""
blockisequal(a::AbstractUnitRange{Int}, b::AbstractUnitRange{Int})
Expand Down Expand Up @@ -440,24 +440,24 @@ Base.BroadcastStyle(::Type{BlockedUnitRange{R}}) where R = Base.BroadcastStyle(R

_blocklengths2blocklasts(blocks::AbstractRange) = RangeCumsum(blocks)
function blockfirsts(a::BlockedUnitRange{Base.OneTo{Int}})
a.first == 1 || error("Offset axes not supported")
Base.OneTo{Int}(length(a.lasts))
first(a) == 1 || error("Offset axes not supported")
Base.OneTo{Int}(length(blocklasts(a)))
end
function blocklengths(a::BlockedUnitRange{Base.OneTo{Int}})
a.first == 1 || error("Offset axes not supported")
Ones{Int}(length(a.lasts))
first(a) == 1 || error("Offset axes not supported")
Ones{Int}(length(blocklasts(a)))
end
function blockfirsts(a::BlockedUnitRange{<:AbstractRange})
st = step(a.lasts)
a.first == 1 || error("Offset axes not supported")
@assert first(a.lasts)-a.first+1 == st
range(1; step=st, length=length(a.lasts))
st = step(blocklasts(a))
first(a) == 1 || error("Offset axes not supported")
@assert first(blocklasts(a))-first(a)+1 == st
range(1; step=st, length=length(blocklasts(a)))
end
function blocklengths(a::BlockedUnitRange{<:AbstractRange})
st = step(a.lasts)
a.first == 1 || error("Offset axes not supported")
@assert first(a.lasts)-a.first+1 == st
Fill(st,length(a.lasts))
st = step(blocklasts(a))
first(a) == 1 || error("Offset axes not supported")
@assert first(blocklasts(a))-first(a)+1 == st
Fill(st,length(blocklasts(a)))
end


Expand Down
4 changes: 4 additions & 0 deletions test/test_blockindices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ end
@test blocklasts(f) ≡ StepRangeLen(2,2,5)
@test blocklengths(f) ≡ Fill(2,5)

f = blockedrange(Zeros{Int}(2))
@test blockfirsts(f) == [1,1]
@test blocklasts(f) == [0,0]

r = blockedrange(Base.OneTo(5))
@test (@inferred blocklengths(r)) == 1:5
@test blocklasts(r) ≡ ArrayLayouts.RangeCumsum(Base.OneTo(5))
Expand Down
Loading