Skip to content

Reflect DiskArrays internals renaming #34

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 4 commits into from
Feb 20, 2025
Merged

Reflect DiskArrays internals renaming #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4394120
Reflect DiskArrays internals renaming
felixcremer Feb 20, 2025
d45ba34
Update compat and version
felixcremer Feb 20, 2025
4fd878c
Restrict DiskArrays to 0.4.10 or higher
felixcremer Feb 20, 2025
4baa2c4
Increase minimal julia version to 1.9 and test on lts
felixcremer Feb 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6'
- 'lts'
- '1'
os:
- ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DiskArrayTools"
uuid = "fcd2136c-9f69-4db6-97e5-f31981721d63"
authors = ["Fabian Gans <fgans@bgc-jena.mpg.de>"]
version = "0.1.11"
version = "0.1.12"

[deps]
DiskArrays = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
Expand All @@ -10,11 +10,11 @@ IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"

[compat]
DiskArrays = "0.3.7, 0.4"
DiskArrays = "0.4.10"
Interpolations = "0.12, 0.13, 0.14, 0.15"
IterTools = "1"
OffsetArrays = "1"
julia = "1.6"
julia = "1.9"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
12 changes: 6 additions & 6 deletions src/DiskArrayTools.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module DiskArrayTools
import DiskArrays: AbstractDiskArray, eachchunk, haschunks, Chunked,Unchunked,
estimate_chunksize, GridChunks, findints, readblock!, writeblock!,
RegularChunks, IrregularChunks, ChunkType, approx_chunksize, chunktype_from_chunksizes
estimate_chunksize, GridChunks, readblock!, writeblock!,
RegularChunks, IrregularChunks, ChunkVector, approx_chunksize, chunktype_from_chunksizes
using Interpolations
using IterTools: imap
using Base.Iterators: product
Expand Down Expand Up @@ -157,7 +157,7 @@ function aggregate_chunks(cs,agg)
inds = [searchsortedfirst(lagg,lc) for lc in lcs]
chunktype_from_chunksizes(diff([0;inds]))
end
interpret_aggsize(_, x::ChunkType) = x
interpret_aggsize(_, x::ChunkVector) = x
interpret_aggsize(sparent,x) = RegularChunks(x,0,sparent)


Expand Down Expand Up @@ -351,14 +351,14 @@ function writeblock!(a::ConcatDiskArray, aout, inds::AbstractUnitRange...)
end

function mergechunks(a::RegularChunks, b::RegularChunks)
if a.s==0 || (a.cs == b.cs && length(last(a))==a.cs)
RegularChunks(a.cs, a.offset,a.s+b.s)
if a.arraysize==0 || (a.chunksize == b.chunksize && length(last(a))==a.chunksize)
RegularChunks(a.chunksize, a.offset,a.arraysize+b.arraysize)
else
mergechunks_irregular(a,b)
end
end

mergechunks(a::ChunkType, b::ChunkType) = mergechunks_irregular(a,b)
mergechunks(a::ChunkVector, b::ChunkVector) = mergechunks_irregular(a,b)
function mergechunks_irregular(a, b)
IrregularChunks(chunksizes = filter(!iszero,[length.(a); length.(b)]))
end
Expand Down
Loading