summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-07-11 14:03:53 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-07-11 14:03:53 (GMT)
commit61cb9cc54727f9b7658eaadd2abaeedb100b9fc1 (patch)
tree0305f45eac28c61c115ad9b00cd1fc82255f18fa /tools
parent91d63fa0ae9cfe13ef73bd6d4c05b1e47b4a6ebf (diff)
downloadhdf5-61cb9cc54727f9b7658eaadd2abaeedb100b9fc1.zip
hdf5-61cb9cc54727f9b7658eaadd2abaeedb100b9fc1.tar.gz
hdf5-61cb9cc54727f9b7658eaadd2abaeedb100b9fc1.tar.bz2
[svn-r22550] Correct datatypes in generator and update files for test.
Tested: local linux with cmake
Diffstat (limited to 'tools')
-rw-r--r--tools/h5dump/h5dumpgentest.c14
-rw-r--r--tools/testfiles/tnestedcmpddt.ddl130
-rw-r--r--tools/testfiles/tnestedcmpddt.h5bin16536 -> 16536 bytes
3 files changed, 72 insertions, 72 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index da78089..a9b5a62 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -8014,8 +8014,8 @@ static void gent_nested_compound_dt(void) { /* test nested data type */
space = H5Screate_simple(1, &sdim, &maxdim);
type = H5Tcreate (H5T_COMPOUND, sizeof(dset1[0]));
- H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
- H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
+ H5Tinsert(type, "a_name", HOFFSET(dset1_t, a), H5T_STD_I32LE);
+ H5Tinsert(type, "b_name", HOFFSET(dset1_t, b), H5T_IEEE_F32LE);
dataset = H5Dcreate2(fid, "/dset1", type, space, H5P_DEFAULT, create_plist, H5P_DEFAULT);
@@ -8058,8 +8058,8 @@ static void gent_nested_compound_dt(void) { /* test nested data type */
/* shared data type 1 */
type1 = H5Tcreate(H5T_COMPOUND, sizeof(dset1_t));
- H5Tinsert(type1, "int_name", HOFFSET(dset1_t, a), H5T_STD_I32BE);
- H5Tinsert(type1, "float_name", HOFFSET(dset1_t, b), H5T_IEEE_F32BE);
+ H5Tinsert(type1, "int_name", HOFFSET(dset1_t, a), H5T_STD_I32LE);
+ H5Tinsert(type1, "float_name", HOFFSET(dset1_t, b), H5T_IEEE_F32LE);
H5Tcommit2(fid, "type1", type1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
group = H5Gcreate2(fid, "/group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -8067,12 +8067,12 @@ static void gent_nested_compound_dt(void) { /* test nested data type */
type2 = H5Tcreate (H5T_COMPOUND, sizeof(dset3_t));
ndims = 1; dim[0] = 5;
- array_dt = H5Tarray_create2(H5T_STD_I32BE, ndims, dim);
+ array_dt = H5Tarray_create2(H5T_STD_I32LE, ndims, dim);
H5Tinsert(type2, "int_name", HOFFSET(dset3_t, a), array_dt);
H5Tclose(array_dt);
ndims = 2; dim[0] = 5; dim[1] = 6;
- array_dt = H5Tarray_create2(H5T_IEEE_F32BE, ndims, dim);
+ array_dt = H5Tarray_create2(H5T_IEEE_F32LE, ndims, dim);
H5Tinsert(type2, "float_name", HOFFSET(dset3_t, b), array_dt);
H5Tclose(array_dt);
@@ -8083,7 +8083,7 @@ static void gent_nested_compound_dt(void) { /* test nested data type */
H5Dwrite(dataset, type2, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset3);
dataset = H5Dcreate2(fid, "/dset5", type1, space, H5P_DEFAULT, create_plist, H5P_DEFAULT);
- H5Dwrite(dataset, type1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset5);
+ H5Dwrite(dataset, type1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset1);
H5Tclose(type1);
H5Tclose(type2);
diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/testfiles/tnestedcmpddt.ddl
index 8f1af21..db949f0 100644
--- a/tools/testfiles/tnestedcmpddt.ddl
+++ b/tools/testfiles/tnestedcmpddt.ddl
@@ -2,8 +2,8 @@ HDF5 "tnestedcmpddt.h5" {
GROUP "/" {
DATASET "dset1" {
DATATYPE H5T_COMPOUND {
- H5T_STD_I32BE "a_name";
- H5T_IEEE_F32BE "b_name";
+ H5T_STD_I32LE "a_name";
+ H5T_IEEE_F32LE "b_name";
}
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
DATA {
@@ -12,24 +12,24 @@ GROUP "/" {
0
},
(1): {
- 16777216,
- 4.6006e-41
+ 1,
+ 1
},
(2): {
- 33554432,
- 4.60074e-41
+ 2,
+ 4
},
(3): {
- 50331648,
- 5.8308e-42
+ 3,
+ 9
},
(4): {
- 67108864,
- 4.60088e-41
+ 4,
+ 16
},
(5): {
- 83886080,
- 7.18376e-41
+ 5,
+ 25
}
}
}
@@ -92,28 +92,28 @@ GROUP "/" {
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
DATA {
(0): {
- -1434300087,
- -1.69532e-21
+ 0,
+ 0
},
(1): {
- -965921664,
- -7.63504e-06
+ 1,
+ 1
},
(2): {
- 0,
- 1.01342e-41
+ 2,
+ 4
},
(3): {
- 485220918,
- 2.64926e-23
+ 3,
+ 9
},
(4): {
- 970376557,
- 1.19312e-07
+ 4,
+ 16
},
(5): {
- 1438754980,
- 5.37334e+08
+ 5,
+ 25
}
}
}
@@ -128,11 +128,11 @@ GROUP "/" {
GROUP "group1" {
DATASET "dset3" {
DATATYPE H5T_COMPOUND {
- H5T_ARRAY { [5] H5T_STD_I32BE } "int_name";
- H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_name";
+ H5T_ARRAY { [5] H5T_STD_I32LE } "int_name";
+ H5T_ARRAY { [5][6] H5T_IEEE_F32LE } "float_name";
H5T_COMPOUND {
- H5T_STD_I32BE "int_name";
- H5T_IEEE_F32BE "float_name";
+ H5T_STD_I32LE "int_name";
+ H5T_IEEE_F32LE "float_name";
} "cmpd_name";
}
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
@@ -150,71 +150,71 @@ GROUP "/" {
}
},
(1): {
- [ 0, 16777216, 33554432, 50331648, 67108864 ],
+ [ 0, 1, 2, 3, 4 ],
[ 0, 0, 0, 0, 0, 0,
- 0, 4.6006e-41, 8.96831e-44, 2.30486e-41, 4.60074e-41, 5.74869e-41,
- 0, 8.96831e-44, 4.60074e-41, 6.89663e-41, 9.10844e-44, 1.15705e-41,
- 0, 2.30486e-41, 6.89663e-41, 5.8308e-42, 2.305e-41, 4.02691e-41,
- 0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41 ],
+ 0, 1, 2, 3, 4, 5,
+ 0, 2, 4, 6, 8, 10,
+ 0, 3, 6, 9, 12, 15,
+ 0, 4, 8, 12, 16, 20 ],
{
- 16777216,
- 4.6006e-41
+ 1,
+ 1
}
},
(2): {
- [ 0, 33554432, 67108864, 100663296, 134217728 ],
+ [ 0, 2, 4, 6, 8 ],
[ 0, 0, 0, 0, 0, 0,
- 0, 8.96831e-44, 4.60074e-41, 6.89663e-41, 9.10844e-44, 1.15705e-41,
- 0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41,
- 0, 6.89663e-41, 2.305e-41, 5.17486e-41, 6.89677e-41, 8.61869e-41,
- 0, 9.10844e-44, 4.60088e-41, 6.89677e-41, 9.24857e-44, 1.15719e-41 ],
+ 0, 2, 4, 6, 8, 10,
+ 0, 4, 8, 12, 16, 20,
+ 0, 6, 12, 18, 24, 30,
+ 0, 8, 16, 24, 32, 40 ],
{
- 33554432,
- 8.96831e-44
+ 2,
+ 2
}
},
(3): {
- [ 0, 50331648, 100663296, 150994944, 201326592 ],
+ [ 0, 3, 6, 9, 12 ],
[ 0, 0, 0, 0, 0, 0,
- 0, 2.30486e-41, 6.89663e-41, 5.8308e-42, 2.305e-41, 4.02691e-41,
- 0, 6.89663e-41, 2.305e-41, 5.17486e-41, 6.89677e-41, 8.61869e-41,
- 0, 5.8308e-42, 5.17486e-41, 7.75773e-41, 5.8322e-42, 1.87466e-41,
- 0, 2.305e-41, 6.89677e-41, 5.8322e-42, 2.30514e-41, 4.02705e-41 ],
+ 0, 3, 6, 9, 12, 15,
+ 0, 6, 12, 18, 24, 30,
+ 0, 9, 18, 27, 36, 45,
+ 0, 12, 24, 36, 48, 60 ],
{
- 50331648,
- 2.30486e-41
+ 3,
+ 3
}
},
(4): {
- [ 0, 67108864, 134217728, 201326592, 268435456 ],
+ [ 0, 4, 8, 12, 16 ],
[ 0, 0, 0, 0, 0, 0,
- 0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41,
- 0, 9.10844e-44, 4.60088e-41, 6.89677e-41, 9.24857e-44, 1.15719e-41,
- 0, 2.305e-41, 6.89677e-41, 5.8322e-42, 2.30514e-41, 4.02705e-41,
- 0, 4.60088e-41, 9.24857e-44, 2.30514e-41, 4.60102e-41, 5.74897e-41 ],
+ 0, 4, 8, 12, 16, 20,
+ 0, 8, 16, 24, 32, 40,
+ 0, 12, 24, 36, 48, 60,
+ 0, 16, 32, 48, 64, 80 ],
{
- 67108864,
- 4.60074e-41
+ 4,
+ 4
}
},
(5): {
- [ 0, 83886080, 167772160, 251658240, 335544320 ],
+ [ 0, 5, 10, 15, 20 ],
[ 0, 0, 0, 0, 0, 0,
- 0, 5.74869e-41, 1.15705e-41, 4.02691e-41, 5.74883e-41, 7.18376e-41,
- 0, 1.15705e-41, 5.74883e-41, 8.61869e-41, 1.15719e-41, 2.59212e-41,
- 0, 4.02691e-41, 8.61869e-41, 1.87466e-41, 4.02705e-41, 5.39023e-41,
- 0, 5.74883e-41, 1.15719e-41, 4.02705e-41, 5.74897e-41, 7.1839e-41 ],
+ 0, 5, 10, 15, 20, 25,
+ 0, 10, 20, 30, 40, 50,
+ 0, 15, 30, 45, 60, 75,
+ 0, 20, 40, 60, 80, 100 ],
{
- 83886080,
- 5.74869e-41
+ 5,
+ 5
}
}
}
}
}
DATATYPE "type1" H5T_COMPOUND {
- H5T_STD_I32BE "int_name";
- H5T_IEEE_F32BE "float_name";
+ H5T_STD_I32LE "int_name";
+ H5T_IEEE_F32LE "float_name";
}
}
}
diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/testfiles/tnestedcmpddt.h5
index 4d992bc..f2af756 100644
--- a/tools/testfiles/tnestedcmpddt.h5
+++ b/tools/testfiles/tnestedcmpddt.h5
Binary files differ