Skip to content

Test and fix indexing with Chunkindex type #299

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
meggart merged 2 commits into from
Jun 5, 2026
Merged

Test and fix indexing with Chunkindex type #299

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
9c388c2
Test and fix indexing with Chunkindex type
meggart Jun 5, 2026
aed373b
Bump patch version
meggart Jun 5, 2026
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 = "DiskArrays"
uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
authors = ["Fabian Gans <fgans@bgc-jena.mpg.de>"]
version = "0.4.20"
version = "0.4.21"

[deps]
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
Expand Down
2 changes: 1 addition & 1 deletion src/chunks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ end
Base.size(i::ChunkIndices) = length.(i.I)
Base.getindex(A::ChunkIndices{N}, I::Vararg{Int,N}) where {N} =
ChunkIndex(CartesianIndex(getindex.(A.I, I)), A.chunktype)
Base.eltype(::Type{<:ChunkIndices{N}}) where {N} = ChunkIndex{N}
Base.eltype(::Type{<:ChunkIndices{N,<:Any,O}}) where {N,O} = ChunkIndex{N,O}

"""
element_size(a::AbstractArray)
Expand Down
4 changes: 4 additions & 0 deletions src/diskarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@ Returns a trait for the chunk pattern of a dis array,
"""
function haschunks end
haschunks(x) = Unchunked()

function Base.checkbounds(::Type{Bool}, a::AbstractDiskArray, i::ChunkIndex)
checkbounds(Bool, eachchunk(a), i.I)
end
28 changes: 27 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using DiskArrays
using DiskArrays: ReshapedDiskArray, PermutedDiskArray
using DiskArrays: ReshapedDiskArray, PermutedDiskArray, DiskIndex
using DiskArrays.TestTypes
using Test
using Statistics
Expand Down Expand Up @@ -1193,3 +1193,29 @@ end
@test DiskArrays.haschunks(a_chunked_2) isa DiskArrays.Chunked
@test size(DiskArrays.eachchunk(a_chunked_2)) == (5,5)
end


@testset "ChunkIndex" begin
data = reshape(1:20, 4, 5)
a = AccessCountDiskArray(data, chunksize=(2, 2))
a[ChunkIndex(2, 2)] == a[eachchunk(a)[2, 2]...]
a[ChunkIndex(2, 3)] == a[eachchunk(a)[2, 3]...]
@test_throws BoundsError a[ChunkIndex(0, 1)]
@test_throws BoundsError a[ChunkIndex(3, 1)]
@test_throws BoundsError a[ChunkIndex(1, 4)]

chunkinds = ChunkIndices(a)
@test size(chunkinds) == (2, 3)
@test eltype(chunkinds) == ChunkIndex{2,DiskArrays.OneBasedChunks}
@test chunkinds[1, 1] == ChunkIndex(1, 1)

a_offset = a[ChunkIndex(2, 2, offset=true)]
@test a_offset isa DiskArrays.OffsetArray
@test size(a_offset) == (2, 2)
@test a_offset[3:4, 3:4] == a[3:4, 3:4]

chunkinds_offset = ChunkIndices(a, offset=true)
@test size(chunkinds_offset) == (2, 3)
@test eltype(chunkinds_offset) == ChunkIndex{2,DiskArrays.OffsetChunks}
@test chunkinds_offset[1, 1] == ChunkIndex(1, 1, offset=true)
end
Loading