From 47467c22dcb907d7f5ecc7c274d4c6f10ed8816d Mon Sep 17 00:00:00 2001 From: Juan Ignacio Polanco Date: Fri, 4 Dec 2020 08:31:46 +0100 Subject: [PATCH 1/2] Bring back compatibility with HDF5 < 1.12 --- deps/build.jl | 3 --- test/plain.jl | 11 +++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 0c94c1677..3736e5044 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -35,9 +35,6 @@ else if libhdf5_size != filesize(Libdl.dlpath(libhdf5)) error("HDF5 library has changed, re-run Pkg.build(\\\"HDF5\\\")") end - if libversion < v"1.12" - error("HDF5.jl requires ≥ v1.12 of the HDF5 library.") - end end """ ) diff --git a/test/plain.jl b/test/plain.jl index 2c821ddee..1e3fd48fd 100644 --- a/test/plain.jl +++ b/test/plain.jl @@ -713,16 +713,19 @@ dspace_scal = HDF5.Dataspace(HDF5.h5s_create(HDF5.H5S_SCALAR)) dspace_norm = dataspace((100, 4)) dspace_maxd = dataspace((100, 4), max_dims = (256, 4)) dspace_slab = HDF5.hyperslab(dataspace((100, 4)), 1:20:100, 1:4) -dspace_irrg = HDF5.Dataspace(HDF5.h5s_combine_select( - HDF5.h5s_copy(dspace_slab), HDF5.H5S_SELECT_OR, - HDF5.hyperslab(dataspace((100, 4)), 2, 2))) @test sprint(show, dspace_null) == "HDF5.Dataspace: H5S_NULL" @test sprint(show, dspace_scal) == "HDF5.Dataspace: H5S_SCALAR" @test sprint(show, dspace_norm) == "HDF5.Dataspace: (100, 4)" @test sprint(show, dspace_maxd) == "HDF5.Dataspace: (100, 4) / (256, 4)" @test sprint(show, dspace_slab) == "HDF5.Dataspace: (1:20:81, 1:4) / (1:100, 1:4)" -@test sprint(show, dspace_irrg) == "HDF5.Dataspace: (100, 4) [irregular selection]" + +if HDF5.libversion ≥ v"1.12" + dspace_irrg = HDF5.Dataspace(HDF5.h5s_combine_select( + HDF5.h5s_copy(dspace_slab), HDF5.H5S_SELECT_OR, + HDF5.hyperslab(dataspace((100, 4)), 2, 2))) + @test sprint(show, dspace_irrg) == "HDF5.Dataspace: (100, 4) [irregular selection]" +end # Now test printing after closing each object From 642deccbaa9fdc0caa399f3906380a780d74e828 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Polanco Date: Fri, 4 Dec 2020 17:23:49 +0100 Subject: [PATCH 2/2] h5s_combine_select was introduced in HDF5 1.10.7 --- test/plain.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plain.jl b/test/plain.jl index 1e3fd48fd..8d4bd6fee 100644 --- a/test/plain.jl +++ b/test/plain.jl @@ -720,7 +720,7 @@ dspace_slab = HDF5.hyperslab(dataspace((100, 4)), 1:20:100, 1:4) @test sprint(show, dspace_maxd) == "HDF5.Dataspace: (100, 4) / (256, 4)" @test sprint(show, dspace_slab) == "HDF5.Dataspace: (1:20:81, 1:4) / (1:100, 1:4)" -if HDF5.libversion ≥ v"1.12" +if HDF5.libversion ≥ v"1.10.7" dspace_irrg = HDF5.Dataspace(HDF5.h5s_combine_select( HDF5.h5s_copy(dspace_slab), HDF5.H5S_SELECT_OR, HDF5.hyperslab(dataspace((100, 4)), 2, 2)))