Skip to content

Update [compat] #15

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
timholy merged 1 commit into from
Apr 27, 2022
Merged

Update [compat] #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

[compat]
Formatting = "0.4"
HDF5 = "0.12"
ImageCore = "0.8.1"
HDF5 = "0.12, 0.13, 0.14, 0.15, 0.16"
ImageCore = "0.8.1, 0.9"
ImageMetadata = "0.9"
JLD = "0.9"
JLD = "0.9, 0.10, 0.11, 0.12, 0.13"
RegisterCore = "0.2"
RegisterWorkerShell = "0.2"
StaticArrays = "0.11, 0.12"
StaticArrays = "0.11, 0.12, 1"
julia = "1"

[extras]
Expand Down
22 changes: 17 additions & 5 deletions src/RegisterDriver.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ using ImageCore, ImageMetadata, JLD, HDF5, StaticArrays, Formatting, SharedArray
using RegisterCore
using RegisterWorkerShell

if isdefined(HDF5, :BitsType)
const BitsType = HDF5.BitsType
else
const BitsType = HDF5.HDF5BitsKind
end
if !isdefined(HDF5, :create_dataset)
const create_dataset = d_create
end
if !isdefined(HDF5, :create_group)
const create_group = g_create
end

export driver, mm_package_loader

"""
Expand Down Expand Up @@ -103,7 +115,7 @@ function driver(outfile::AbstractString, algorithm::Vector, img, mon::Vector)
continue
elseif isa(v, Array) || isa(v, SharedArray)
vw = nicehdf5(v)
if eltype(vw) <: HDF5.HDF5BitsKind
if eltype(vw) <: BitsType
colons = [Colon() for i = 1:ndims(vw)]
dsets[k][colons..., idx] = vw
continue
Expand Down Expand Up @@ -158,23 +170,23 @@ function initialize_jld!(dsets, file, mon, fs, n)
dsets[k] = file[kstr]
elseif isa(v, Array) || isa(v, SharedArray)
v = nicehdf5(v)
if eltype(v) <: HDF5.HDF5BitsKind
if eltype(v) <: BitsType
fullsz = (size(v)..., n)
dsets[k] = d_create(file.plain, kstr, datatype(eltype(v)), dataspace(fullsz))
dsets[k] = create_dataset(file.plain, kstr, datatype(eltype(v)), dataspace(fullsz))
else
write(file, kstr, Array{eltype(v)}(undef, size(v)..., n)) # might fail if it's too big, but we tried
end
dsets[k] = file[kstr]
elseif isa(v, ArrayDecl) # maybe this never happens?
fullsz = (v.arraysize..., n)
dsets[k] = d_create(file.plain, kstr, datatype(eltype(v)), dataspace(fullsz))
dsets[k] = create_dataset(file.plain, kstr, datatype(eltype(v)), dataspace(fullsz))
else
have_unpackable = true
end
end
if have_unpackable
for i = 1:n
g_create(file, string("stack", fmt(fs, i)))
create_group(file, string("stack", fmt(fs, i)))
end
end
have_unpackable
Expand Down