fix opaquedata

JuliaIO · Jan 2, 2024 · 8edaeed · 8edaeed
1 parent bbf7d39
commit 8edaeed
Show file tree

Hide file tree

Showing 2 changed files with 115 additions and 115 deletions.
diff --git a/src/data/specialcased_types.jl b/src/data/specialcased_types.jl
@@ -3,8 +3,8 @@ struct OpaqueData{N}
  data::Vector{UInt8}
  OpaqueData(data) = new{length(data)}(data)
 end
-odr_sizeof(x::Type{OpaqueData{N}}) where {N} = UInt32(N)
-function jlconvert(rr::ReadRepresentation{OpaqueData{N}, Vector{UInt8}}, ::JLDFile, ptr::Ptr, ::RelOffset) where N
+
+function jlconvert(rr::ReadRepresentation{OpaqueData{N}, NTuple{N,UInt8}}, ::JLDFile, ptr::Ptr, ::RelOffset) where N
  data = Vector{UInt8}(undef, N)
  unsafe_copyto!(pointer(data), convert(Ptr{UInt8}, ptr), N)
  OpaqueData(data)
@@ -62,7 +62,7 @@ function jltype(f::JLDFile, dt::BasicDatatype)
  throw(UnsupportedFeatureException("Encountered an unsupported string type. $dt"))
  end
  elseif dt.class << 4 == DT_OPAQUE << 4
- return ReadRepresentation{OpaqueData{Int(dt.size)},Vector{UInt8}}()
+ return ReadRepresentation{OpaqueData{Int(dt.size)},NTuple{Int(dt.size),UInt8}}()
 
  else
  throw(UnsupportedFeatureException("Encountered an unsupported type."))
@@ -77,7 +77,7 @@ function jltype(f::JLDFile, dt::BasicDatatype)
  throw(UnsupportedFeatureException("Encountered an unsupported string type."))
  end
  elseif dt.class << 4 == DT_OPAQUE << 4
- return ReadRepresentation{OpaqueData{Int(dt.size)},Vector{UInt8}}()
+ return ReadRepresentation{OpaqueData{Int(dt.size)},NTuple{Int(dt.size),UInt8}}()
  elseif dt.class << 4 == DT_REFERENCE << 4
  return ReadRepresentation{Any,RelOffset}()
  else

diff --git a/test/test_files.jl b/test/test_files.jl
@@ -7,119 +7,119 @@ testfiles = artifact"testfiles/JLD2TestFiles-0.1.0/artifacts"
 @testset "HDF5 compat test files" begin
  # These are test files copied from the HDF5.jl test suite
 
+ fn = joinpath(testfiles,"compound.h5")
+ jldopen(fn) do f 
+ data = f["data"]
+ @test data[1] == data[2]
+ nt = data[1]
+ @test nt.wgt == 1.0
+ @test nt.xyz == [-2.4559041161056125, 0.43236207188504794, -0.5088338908493437]
+ @test nt.uvw == [-0.44966656055677057, 0.6453930541533174, 0.6174688574881305]
+ @test nt.E == 1.1915731810042547
+ end
+
+ # Should return some enum type and load names correctly
+ fn = joinpath(testfiles,"h5ex_t_enum.h5")
+ jldopen(fn) do f
+ @test size(f["DS1"]) == (7,4)
+ end 
+
+ fn = joinpath(testfiles,"h5ex_t_array.h5")
+ jldopen(fn) do f
+ @test f["DS1"][1] == (0:-1:-4) .* [0,1,2]'
+ @test f["DS1"][2] == hcat(collect(0:4), ones(Int,5), collect(2:-1:-2))
+ end
+
+ fn = joinpath(testfiles,"h5ex_t_float.h5")
+ jldopen(fn) do f
+ @test size(f["DS1"]) == (7,4)
+ @test f["DS1"][9] ≈ 5/3
+ end
+
+ # Big Endian Integers are not implemented
+ fn = joinpath(testfiles,"h5ex_t_int.h5")
+ jldopen(fn) do f
+ @test f["DS1"] == [0:-1:-6 zeros(Int,7) 0:6 0:2:12]
+ end
+
+ fn = joinpath(testfiles,"h5ex_t_objref.h5")
+ jldopen(fn) do f
+ @test f["DS1"][1] === f["G1"]
+ @test f["DS1"][2] === f["DS2"]
+ end
+
+ fn = joinpath(testfiles,"h5ex_t_opaque.h5")
+ jldopen(fn) do f
+ @test f["DS1"][1].data == [0x4f, 0x50, 0x41, 0x51, 0x55, 0x45, 0x30]
+ @test f["DS1"][2].data == [0x4f, 0x50, 0x41, 0x51, 0x55, 0x45, 0x31]
+ @test f["DS1"][3].data == [0x4f, 0x50, 0x41, 0x51, 0x55, 0x45, 0x32]
+ @test f["DS1"][4].data == [0x4f, 0x50, 0x41, 0x51, 0x55, 0x45, 0x33]
+ end
+
+ fn = joinpath(testfiles,"h5ex_t_string.h5")
+ jldopen(fn) do f
+ @test f["DS1"] == ["Parting", "is such", "sweet", "sorrow."]
+ end
 
- fn = joinpath(testfiles,"compound.h5")
- jldopen(fn) do f 
- data = f["data"]
- @test data[1] == data[2]
- nt = data[1]
- @test nt.wgt == 1.0
- @test nt.xyz == [-2.4559041161056125, 0.43236207188504794, -0.5088338908493437]
- @test nt.uvw == [-0.44966656055677057, 0.6453930541533174, 0.6174688574881305]
- @test nt.E == 1.1915731810042547
- end
-
- # Should return some enum type and load names correctly
- fn = joinpath(testfiles,"h5ex_t_enum.h5")
- jldopen(fn) do f
- @test size(f["DS1"]) == (7,4)
- end 
-
- fn = joinpath(testfiles,"h5ex_t_array.h5")
- jldopen(fn) do f
- @test f["DS1"][1] == (0:-1:-4) .* [0,1,2]'
- @test f["DS1"][2] == hcat(collect(0:4), ones(Int,5), collect(2:-1:-2))
- end
-
- fn = joinpath(testfiles,"h5ex_t_float.h5")
- jldopen(fn) do f
- @test size(f["DS1"]) == (7,4)
- @test f["DS1"][9] ≈ 5/3
- end
-
- # Big Endian Integers are not implemented
- fn = joinpath(testfiles,"h5ex_t_int.h5")
- jldopen(fn) do f
- @test f["DS1"] == [0:-1:-6 zeros(Int,7) 0:6 0:2:12]
- end
-
- fn = joinpath(testfiles,"h5ex_t_objref.h5")
- jldopen(fn) do f
- @test f["DS1"][1] === f["G1"]
- @test f["DS1"][2] === f["DS2"]
- end
-
- fn = joinpath(testfiles,"h5ex_t_opaque.h5")
- jldopen(fn) do f
- @test_broken f["DS1"][4].data == [0x4f, 0x50, 0x41, 0x51, 0x55, 0x45, 0x30]
- end
-
- fn = joinpath(testfiles,"h5ex_t_string.h5")
- jldopen(fn) do f
- @test f["DS1"] == ["Parting", "is such", "sweet", "sorrow."]
- end
-
- fn = joinpath(testfiles,"h5ex_t_vlen.h5")
- jldopen(fn) do f
- @test f["DS1"][1] == [3, 2, 1]
- @test f["DS1"][2] == [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144]
- end
-
- fn = joinpath(testfiles,"h5ex_t_vlstring.h5")
- jldopen(fn) do f
- @test f["DS1"] == ["Parting", "is such", "sweet", "sorrow."]
- end
-
- fn = joinpath(testfiles,"nullterm_ascii.h5")
- jldopen(fn) do f
- @test f["test"] == "Hello World"
- end
-
- fn = joinpath(testfiles,"large_fractal_heap.h5")
- jldopen(fn) do f
- @test length(keys(f)) == 200000
- end
-
- fn = joinpath(testfiles,"netcdf.nc")
- jldopen(fn) do f
- @test f["hello"] == ones(5)
- #@test_broken f["x"]
- #@test_broken f["z"]
- @test f["grouped/data"] == 0:9
- #@test_broken f["grouped/y"]
- end
-
- fn = joinpath(testfiles,"simple.nc")
- jldopen(fn) do f
- @test f["dim1"] == [2, 4, 6]
- @test f["dim2"] == ["a", "b", "c", "d"]
- @test f["mydata"] == Matrix(reshape(1:12, 4, 3))
- JLD2.load_attributes(f, "dim1") # not sure what to test for. just not erroring so far
- JLD2.load_attributes(f, "dim2")
- JLD2.load_attributes(f, "mydata")
- end
-
- # julia> using JLD
- # julia> struct A; x::Int; y::Float64; z::String; end
- # julia> save("jldstruct.jld", "a", A(1,2.0,"3"))
- fn = joinpath(testfiles,"jldstruct.jld")
- jldopen(fn) do f
- a = f["a"]
- @test a.x == 1
- @test a.y == 2.0
- @test a.z == "3"
- end
-
- fn = joinpath(testfiles,"chunking1.h5")
- jldopen(fn) do f
- @test f["uncompressed_chunks"] == reshape(1:1000., 25, 40)
- @test f["compressed_chunks"] == reshape(1:1000., 25, 40)
- @test f["shuffle_compressed_chunks"] == reshape(1:1000, 25, 40)
- @test size(f["incomplete_allocation"]) == (50,50,10)
- @test f["incomplete_allocation"][1:50,1:50, 2] == reshape(1:2500, 50,50)
- #f["incomplete_allocation"][1,1,1] == 0 
- end
+ fn = joinpath(testfiles,"h5ex_t_vlen.h5")
+ jldopen(fn) do f
+ @test f["DS1"][1] == [3, 2, 1]
+ @test f["DS1"][2] == [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144]
+ end
+
+ fn = joinpath(testfiles,"h5ex_t_vlstring.h5")
+ jldopen(fn) do f
+ @test f["DS1"] == ["Parting", "is such", "sweet", "sorrow."]
+ end
+
+ fn = joinpath(testfiles,"nullterm_ascii.h5")
+ jldopen(fn) do f
+ @test f["test"] == "Hello World"
+ end
+
+ fn = joinpath(testfiles,"large_fractal_heap.h5")
+ jldopen(fn) do f
+ @test length(keys(f)) == 200000
+ end
+
+ fn = joinpath(testfiles,"netcdf.nc")
+ jldopen(fn) do f
+ @test f["hello"] == ones(5)
+ #@test_broken f["x"]
+ #@test_broken f["z"]
+ @test f["grouped/data"] == 0:9
+ #@test_broken f["grouped/y"]
+ end
+
+ fn = joinpath(testfiles,"simple.nc")
+ jldopen(fn) do f
+ @test f["dim1"] == [2, 4, 6]
+ @test f["dim2"] == ["a", "b", "c", "d"]
+ @test f["mydata"] == Matrix(reshape(1:12, 4, 3))
+ JLD2.load_attributes(f, "dim1") # not sure what to test for. just not erroring so far
+ JLD2.load_attributes(f, "dim2")
+ JLD2.load_attributes(f, "mydata")
+ end
+
+ # julia> using JLD
+ # julia> struct A; x::Int; y::Float64; z::String; end
+ # julia> save("jldstruct.jld", "a", A(1,2.0,"3"))
+ fn = joinpath(testfiles,"jldstruct.jld")
+ jldopen(fn) do f
+ a = f["a"]
+ @test a.x == 1
+ @test a.y == 2.0
+ @test a.z == "3"
+ end
 
+ fn = joinpath(testfiles,"chunking1.h5")
+ jldopen(fn) do f
+ @test f["uncompressed_chunks"] == reshape(1:1000., 25, 40)
+ @test f["compressed_chunks"] == reshape(1:1000., 25, 40)
+ @test f["shuffle_compressed_chunks"] == reshape(1:1000, 25, 40)
+ @test size(f["incomplete_allocation"]) == (50,50,10)
+ @test f["incomplete_allocation"][1:50,1:50, 2] == reshape(1:2500, 50,50)
+ #f["incomplete_allocation"][1,1,1] == 0 
  end
 end