philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-10980 - h5diff uses new ref APIs

Browse Source
This commit is contained in:
Allen Byrne
2019-12-19 16:29:35 -06:00
committed by David Young
parent b6b0567bdf
commit d486a9b27e
48 changed files with 1493 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/testfiles/trefer_attr.h5 Normal file
View File

Binary file not shown.

76
tools/testfiles/trefer_attrR.ddl Normal file
View File

@@ -0,0 +1,76 @@
HDF5 "trefer_attr.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
ATTRIBUTE "trefer_attr.h5/Group1/Dataset1/Attr1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 3, 6, 9
}
}
ATTRIBUTE "trefer_attr.h5/Group1/Dataset2/Attr1" {
NULL
}
ATTRIBUTE "trefer_attr.h5/Group1/Attr2" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 1, 4, 7, 10
}
}
ATTRIBUTE "trefer_attr.h5/Group1/Datatype1/Attr3" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 2, 5, 8, 11
}
}
}
}
GROUP "Group1" {
ATTRIBUTE "Attr2" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 1, 4, 7, 10
}
}
DATASET "Dataset1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 0, 0, 0
}
ATTRIBUTE "Attr1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 3, 6, 9
}
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 0, 0, 0
}
}
DATATYPE "Datatype1" H5T_COMPOUND {
H5T_STD_I32LE "a";
H5T_STD_I32LE "b";
H5T_IEEE_F32LE "c";
}
ATTRIBUTE "Attr3" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 2, 5, 8, 11
}
}
}
}
}

BIN
tools/testfiles/trefer_compat.h5 Normal file
View File

Binary file not shown.

114
tools/testfiles/trefer_compatR.ddl Normal file
View File

@@ -0,0 +1,114 @@
HDF5 "trefer_compat.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
DATASET "trefer_compat.h5/Group1/Dataset1"
DATA {
(0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(8,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(9,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
DATASET "trefer_compat.h5/Group1/Dataset2"
DATA {
(0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(8,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(9,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
GROUP "trefer_compat.h5/Group1"
DATATYPE "trefer_compat.h5/Group1/Datatype1"
}
}
DATASET "Dataset4" {
DATATYPE H5T_REFERENCE { H5T_STD_REF_DSETREG }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
DATASET "trefer_compat.h5/Group1/Dataset1" {
REGION_TYPE BLOCK (2,2)-(7,7)
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0
}
}
DATASET "trefer_compat.h5/Group1/Dataset2" {
REGION_TYPE POINT (6,9), (2,2), (8,4), (1,6), (2,8), (3,2),
(0,4), (9,0), (7,1), (3,3)
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
0,
0,
0,
0,
0,
0,
0,
0,
0,
0
}
}
}
}
GROUP "Group1" {
DATASET "Dataset1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
(0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(8,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(9,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
(0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(2,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(3,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(4,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(5,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(6,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(7,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(8,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(9,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
}
DATATYPE "Datatype1" H5T_COMPOUND {
H5T_STD_I32LE "a";
H5T_STD_I32LE "b";
H5T_IEEE_F32LE "c";
}
}
}
}

BIN
tools/testfiles/trefer_ext1.h5 Normal file
View File

Binary file not shown.

BIN
tools/testfiles/trefer_ext2.h5 Normal file
View File

Binary file not shown.

34
tools/testfiles/trefer_extR.ddl Normal file
View File

@@ -0,0 +1,34 @@
HDF5 "trefer_ext2.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
ATTRIBUTE "trefer_ext1.h5/Group1/Dataset1/Attr1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 3, 6, 9
}
}
ATTRIBUTE "trefer_ext1.h5/Group1/Dataset2/Attr1" {
NULL
}
ATTRIBUTE "trefer_ext1.h5/Group1/Attr2" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 1, 4, 7, 10
}
}
ATTRIBUTE "trefer_ext1.h5/Group1/Datatype1/Attr3" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 2, 5, 8, 11
}
}
}
}
}
}

BIN
tools/testfiles/trefer_grp.h5 Normal file
View File

Binary file not shown.

15
tools/testfiles/trefer_grpR.ddl Normal file
View File

@@ -0,0 +1,15 @@
HDF5 "trefer_grp.h5" {
GROUP "/" {
DATASET "dset" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SCALAR
DATA {
GROUP "trefer_grp.h5/group"
}
}
GROUP "group" {
GROUP "group3" {
}
}
}
}

BIN
tools/testfiles/trefer_obj.h5 Normal file
View File

Binary file not shown.

59
tools/testfiles/trefer_objR.ddl Normal file
View File

@@ -0,0 +1,59 @@
HDF5 "trefer_obj.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
DATASET "trefer_obj.h5/Group1/Dataset1"
DATA {
(0): 0
}
}
}
DATASET "Dataset4" {
DATATYPE H5T_REFERENCE { H5T_STD_REF_OBJECT }
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
DATASET "trefer_obj.h5/Group1/Dataset1"
DATA {
(0): 0
}
}
}
DATASET "Dataset5" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
DATASET "trefer_obj.h5/Group1/Dataset1"
}
}
DATASET "Dataset6" {
DATATYPE H5T_REFERENCE { H5T_STD_REF_DSETREG }
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
DATASET "trefer_obj.h5/Group1/Dataset1"
}
}
GROUP "Group1" {
DATASET "Dataset1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
(0): 0
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
(0): 0
}
}
DATATYPE "Datatype1" H5T_COMPOUND {
H5T_STD_I32LE "a";
H5T_STD_I32LE "b";
H5T_IEEE_F32LE "c";
}
}
}
}

BIN
tools/testfiles/trefer_obj_del.h5 Normal file
View File

Binary file not shown.

11
tools/testfiles/trefer_obj_delR.ddl Normal file
View File

@@ -0,0 +1,11 @@
HDF5 "trefer_obj_del.h5" {
GROUP "/" {
DATASET "Dataset2" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SCALAR
DATA {
GROUP "trefer_obj_del.h5"
}
}
}
}

BIN
tools/testfiles/trefer_param.h5 Normal file
View File

Binary file not shown.

43
tools/testfiles/trefer_paramR.ddl Normal file
View File

@@ -0,0 +1,43 @@
HDF5 "trefer_param.h5" {
GROUP "/" {
DATASET "Dataset3" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
NULL
NULL
NULL
NULL
}
}
GROUP "Group1" {
COMMENT "Foo!"
DATASET "Dataset1" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 3, 6, 9
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 0, 0, 0
}
ATTRIBUTE "Attr" {
DATATYPE H5T_STD_U32LE
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
(0): 0, 3, 6, 9
}
}
}
DATATYPE "Datatype1" H5T_COMPOUND {
H5T_STD_I32LE "a";
H5T_STD_I32LE "b";
H5T_IEEE_F32LE "c";
}
}
}
}

BIN
tools/testfiles/trefer_reg.h5 Normal file
View File

Binary file not shown.

66
tools/testfiles/trefer_regR.ddl Normal file
View File

@@ -0,0 +1,66 @@
HDF5 "trefer_reg.h5" {
GROUP "/" {
DATASET "DS_NA" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 1 ) / ( 1 ) }
DATA {
NULL
}
}
DATASET "Dataset1" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 4 ) / ( 4 ) }
DATA {
DATASET "trefer_reg.h5/Dataset2" {
REGION_TYPE BLOCK (2,2)-(7,7)
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
66, 69, 72, 75, 78, 81,
96, 99, 102, 105, 108, 111,
126, 129, 132, 135, 138, 141,
156, 159, 162, 165, 168, 171,
186, 189, 192, 195, 198, 201,
216, 219, 222, 225, 228, 231
}
}
DATASET "trefer_reg.h5/Dataset2" {
REGION_TYPE POINT (6,9), (2,2), (8,4), (1,6), (2,8), (3,2),
(0,4), (9,0), (7,1), (3,3)
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
207,
66,
252,
48,
84,
96,
12,
14,
213,
99
}
}
DATASET "trefer_reg.h5/Dataset2"
DATASET "trefer_reg.h5/Dataset2"
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
DATA {
(0,0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
(1,0): 30, 33, 36, 39, 42, 45, 48, 51, 54, 57,
(2,0): 60, 63, 66, 69, 72, 75, 78, 81, 84, 87,
(3,0): 90, 93, 96, 99, 102, 105, 108, 111, 114, 117,
(4,0): 120, 123, 126, 129, 132, 135, 138, 141, 144, 147,
(5,0): 150, 153, 156, 159, 162, 165, 168, 171, 174, 177,
(6,0): 180, 183, 186, 189, 192, 195, 198, 201, 204, 207,
(7,0): 210, 213, 216, 219, 222, 225, 228, 231, 234, 237,
(8,0): 240, 243, 246, 249, 252, 255, 2, 5, 8, 11,
(9,0): 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
}
}
}
}

BIN
tools/testfiles/trefer_reg_1d.h5 Normal file
View File

Binary file not shown.

66
tools/testfiles/trefer_reg_1dR.ddl Normal file
View File

@@ -0,0 +1,66 @@
HDF5 "trefer_reg_1d.h5" {
GROUP "/" {
DATASET "Dataset1" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
DATASET "trefer_reg_1d.h5/Dataset2" {
REGION_TYPE BLOCK (2)-(3), (7)-(8), (12)-(13), (17)-(18),
(22)-(23), (27)-(28), (32)-(33), (37)-(38), (42)-(43),
(47)-(48), (52)-(53), (57)-(58), (62)-(63), (67)-(68),
(72)-(73)
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 100 ) / ( 100 ) }
DATA {
6, 9,
21, 24,
36, 39,
51, 54,
66, 69,
81, 84,
96, 99,
111, 114,
126, 129,
141, 144,
156, 159,
171, 174,
186, 189,
201, 204,
216, 219
}
}
DATASET "trefer_reg_1d.h5/Dataset2" {
REGION_TYPE POINT (16), (22), (38), (41), (52), (63), (70),
(89), (97), (3)
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 100 ) / ( 100 ) }
DATA {
48,
66,
114,
123,
156,
189,
210,
11,
35,
9
}
}
}
}
DATASET "Dataset2" {
DATATYPE H5T_STD_U8LE
DATASPACE SIMPLE { ( 100 ) / ( 100 ) }
DATA {
(0): 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48,
(17): 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96,
(33): 99, 102, 105, 108, 111, 114, 117, 120, 123, 126, 129, 132, 135,
(46): 138, 141, 144, 147, 150, 153, 156, 159, 162, 165, 168, 171, 174,
(59): 177, 180, 183, 186, 189, 192, 195, 198, 201, 204, 207, 210, 213,
(72): 216, 219, 222, 225, 228, 231, 234, 237, 240, 243, 246, 249, 252,
(85): 255, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41
}
}
}
}