Skip to content

Generalize more functions to non-Int64 ranges #455

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 3 commits into from
Apr 9, 2025
Merged

Generalize more functions to non-Int64 ranges #455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d58c214
fix non Int64 ranges
ogauthe Apr 9, 2025
7d9443e
specify Integer
ogauthe Apr 9, 2025
3a6e33c
bump version
ogauthe Apr 9, 2025
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
8 changes: 8 additions & 0 deletions src/blockaxis.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ end
return (first(a), (blocklasts(a)[oneto(end-1)] .+ oneunit(eltype(a)))...)
end

function Base.AbstractUnitRange{T}(r::BlockedUnitRange) where {T}
return _BlockedUnitRange(convert(T,first(r)), convert.(T,blocklasts(r)))
end

"""
BlockedOneTo{T, <:Union{AbstractVector{T}, NTuple{<:Any,T}}} where {T}

Expand Down Expand Up @@ -156,6 +160,10 @@ BlockedOneTo(::BlockedOneTo) = throw(ArgumentError("Forbidden due to ambiguity")

axes(b::BlockedOneTo) = (b,)

function Base.AbstractUnitRange{T}(r::BlockedOneTo) where {T}
return BlockedOneTo(convert.(T,blocklasts(r)))
end

"""
blockedrange(blocklengths::Union{Tuple, AbstractVector})
blockedrange(first::Integer, blocklengths::Union{Tuple, AbstractVector})
Expand Down
6 changes: 3 additions & 3 deletions src/blockbroadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Base.eltype(::Type{<:SubBlockIterator}) = BlockIndexRange{1,Tuple{UnitRange{Int}
Base.IteratorSize(::Type{<:SubBlockIterator}) = Base.HasLength()
Base.length(it::SubBlockIterator) = length(it.block_lasts)

SubBlockIterator(arr::AbstractArray, bs::NTuple{N,AbstractUnitRange{Int}}, dim::Integer) where N =
SubBlockIterator(arr::AbstractArray, bs::NTuple{N,AbstractUnitRange}, dim::Integer) where N =
SubBlockIterator(blocklasts(axes(arr, dim)), blocklasts(bs[dim]))

function Base.iterate(it::SubBlockIterator, (i, j) = (1,1))
Expand All @@ -113,10 +113,10 @@ function Base.iterate(it::SubBlockIterator, (i, j) = (1,1))
return (bir, (i + 1, j))
end

subblocks(::Any, bs::NTuple{N,AbstractUnitRange{Int}}, dim::Integer) where N =
subblocks(::Any, bs::NTuple{N,AbstractUnitRange}, dim::Integer) where N =
(nothing for _ in blockaxes(bs[dim], 1))

function subblocks(arr::AbstractArray, bs::NTuple{N,AbstractUnitRange{Int}}, dim::Integer) where N
function subblocks(arr::AbstractArray, bs::NTuple{N,AbstractUnitRange}, dim::Integer) where N
return SubBlockIterator(arr, bs, dim)
end

Expand Down
11 changes: 11 additions & 0 deletions test/test_blockrange.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ using BlockArrays, Test
@test BlockRange(1:3) == collect(BlockRange(1:3)) == [Block(1),Block(2),Block(3)]
@test BlockRange(1:3,1:2) == collect(BlockRange(1:3,1:2))
end

# non Int64 range
r = blockedrange([Int32(1)])
@test convert(AbstractUnitRange{Int64}, r) isa BlockedOneTo{Int64}
v = mortar([[1]], (r,))
@test Int.(v) == v

r = blockedrange([Int32(1)])[Block(1):Block(1)]
@test convert(AbstractUnitRange{Int64}, r) isa BlockedUnitRange{Int64}
v = mortar([[1]], (r,))
@test Int.(v) == v
end

@testset "block index range" begin
Expand Down
Loading