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

[svn-r22753] Purpose:

Browse Source 
HDFFV-5919 -  GMQS: h5diff - The number of object difference is not consistent between dataset and group/type when attribute(s) have differences

Description:
  Object differences are not consistent between dataset and group/datatype when their attribute(s) have differences. This is because attribute(s) differences is not accumulated to group or datatype object’s difference, but accumulated to dataset difference.
  To fix, do not accumulate attribute difference to dataset difference.  This is referred to h5diff’s default behavior and also past report from users that users were confused by the accumulated behavior. (also can’t figure out only for dataset difference , also hard to spot dataset difference when it has lots of attributes or differences)
  This also lead to fix inconsistent format indicating difference between dataset and group/datatype object.
  Merged from HDF5 trunk r22751. 

Tested: 
    jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), cmake (jam)
This commit is contained in:
Jonathan Kim
2012-09-11 18:19:53 -05:00
parent 6810576bf2
commit 0c21f00cf8
14 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/h5diff/testfiles/h5diff_220.txt
View File

@@ -1,8 +1,6 @@
Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING
attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>>
3 differences found
dataset: </g1/dset1> and </g1/dset1>
3 differences found
dataset: </g1/dset2> and </g1/dset2>
3 differences found
EXIT CODE: 1

4
tools/h5diff/testfiles/h5diff_221.txt
View File

@@ -1,3 +1,5 @@
dataset: </g2/dset1> and </g2/dset1>
3 differences found
Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING
Not comparable: <attr2> has rank 1, dimensions [3], max dimensions [3]
and <attr2> has rank 1, dimensions [4], max dimensions [4]
@@ -5,8 +7,6 @@ Not comparable: <attr3> has rank 1, dimensions [3], max dimensions [3]
and <attr3> has rank 2, dimensions [3x1], max dimensions [3x1]
attribute: <attr4 of </g2/dset1>> and <attr4 of </g2/dset1>>
3 differences found
dataset: </g2/dset1> and </g2/dset1>
6 differences found
dataset: </g2/dset2> and </g2/dset2>
3 differences found
EXIT CODE: 1

6
tools/h5diff/testfiles/h5diff_222.txt
View File

@@ -4,10 +4,10 @@ Not comparable: </diffobjtypes/obj3> is of type H5G_TYPE and </diffobjtypes/obj3
Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING
attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>>
3 differences found
dataset: </g1/dset1> and </g1/dset1>
3 differences found
dataset: </g1/dset2> and </g1/dset2>
3 differences found
dataset: </g2/dset1> and </g2/dset1>
3 differences found
Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING
Not comparable: <attr2> has rank 1, dimensions [3], max dimensions [3]
and <attr2> has rank 1, dimensions [4], max dimensions [4]
@@ -15,8 +15,6 @@ Not comparable: <attr3> has rank 1, dimensions [3], max dimensions [3]
and <attr3> has rank 2, dimensions [3x1], max dimensions [3x1]
attribute: <attr4 of </g2/dset1>> and <attr4 of </g2/dset1>>
3 differences found
dataset: </g2/dset1> and </g2/dset1>
6 differences found
dataset: </g2/dset2> and </g2/dset2>
3 differences found
EXIT CODE: 1

2
tools/h5diff/testfiles/h5diff_59.txt
View File

@@ -2,10 +2,10 @@ dataset: </dset11a> and </dset11b>
Warning: different storage datatype
</dset11a> has file datatype H5T_STD_U16LE
</dset11b> has file datatype H5T_STD_U32LE
0 differences found
Warning: different storage datatype
<attr> has file datatype H5T_STD_U16LE
<attr> has file datatype H5T_STD_U32LE
attribute: <attr of </dset11a>> and <attr of </dset11b>>
0 differences found
0 differences found
EXIT CODE: 0

2
tools/h5diff/testfiles/h5diff_70.txt
View File

@@ -678,6 +678,7 @@ position vlen3D of </> vlen3D of </> difference
59 differences found
dataset: </dset> and </dset>
Not comparable: </dset> or </dset> is an empty dataset
0 differences found
attribute: <VLstring of </dset>> and <VLstring of </dset>>
size: [2] [2]
position VLstring of </dset> VLstring of </dset> difference
@@ -1353,7 +1354,6 @@ position vlen3D of </dset> vlen3D of </dset> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
519 differences found
group : </g1> and </g1>
0 differences found
attribute: <VLstring of </g1>> and <VLstring of </g1>>

2
tools/h5diff/testfiles/h5diff_700.txt
View File

@@ -681,6 +681,7 @@ position vlen3D of </> vlen3D of </> difference
dataset: </dset> and </dset>
Not comparable: </dset> or </dset> is an empty dataset
0 differences found
Attributes status: 33 common, 0 only in obj1, 0 only in obj2
attribute: <VLstring of </dset>> and <VLstring of </dset>>
size: [2] [2]
@@ -1357,7 +1358,6 @@ position vlen3D of </dset> vlen3D of </dset> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
519 differences found
group : </g1> and </g1>
0 differences found

2
tools/h5diff/testfiles/h5diff_701.txt
View File

@@ -713,6 +713,7 @@ position vlen3D of </> vlen3D of </> difference
dataset: </dset> and </dset>
Not comparable: </dset> or </dset> is an empty dataset
0 differences found
obj1 obj2
--------------------------------------
x x VLstring
@@ -1424,7 +1425,6 @@ position vlen3D of </dset> vlen3D of </dset> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
519 differences found
group : </g1> and </g1>
0 differences found

2
tools/h5diff/testfiles/h5diff_702.txt
View File

@@ -681,6 +681,7 @@ position vlen3D of </> vlen3D of </> difference
dataset: </dset> and </dset>
Not comparable: </dset> or </dset> is an empty dataset
0 differences found
Attributes status: 33 common, 0 only in obj1, 0 only in obj2
attribute: <VLstring of </dset>> and <VLstring of </dset>>
size: [2] [2]
@@ -1357,7 +1358,6 @@ position vlen3D of </dset> vlen3D of </dset> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
519 differences found
group : </g1> and </g1>
0 differences found

2
tools/h5diff/testfiles/h5diff_703.txt
View File

@@ -713,6 +713,7 @@ position vlen3D of </> vlen3D of </> difference
dataset: </dset> and </dset>
Not comparable: </dset> or </dset> is an empty dataset
0 differences found
obj1 obj2
--------------------------------------
x x VLstring
@@ -1424,7 +1425,6 @@ position vlen3D of </dset> vlen3D of </dset> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
519 differences found
group : </g1> and </g1>
0 differences found

2
tools/h5diff/testfiles/h5diff_705.txt
View File

@@ -1,5 +1,6 @@
dataset: </dset> and </dset>
0 differences found
obj1 obj2
--------------------------------------
x float2
@@ -13,5 +14,4 @@ position integer1 of </dset> integer1 of </dset> difference
[ 0 ] 1 2 1
[ 1 ] 2 3 1
2 differences found
2 differences found
EXIT CODE: 1

2
tools/h5diff/testfiles/h5diff_710.txt
View File

@@ -17,6 +17,7 @@ group : </> and </>
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
dataset: </dset> and </dset>
0 differences found
obj1 obj2
--------------------------------------
x float2
@@ -30,7 +31,6 @@ position integer1 of </dset> integer1 of </dset> difference
[ 0 ] 1 2 1
[ 1 ] 2 3 1
2 differences found
2 differences found
group : </g> and </g>
0 differences found