mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14188] added a named datatype with attributes to the h5 file that shows attributes with several iteration orders

Browse Source 
tested: windows, linux
This commit is contained in:
Pedro Vicente Nunes 2007-10-05 09:53:24 -05:00
parent 1de51c7bc1
commit 59b7b09846
7 changed files with 120 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
tools/h5dump/h5dumpgentest.c
View File

@ -5912,8 +5912,10 @@ gent_attr_creation_order(void)
hid_t did; /* dataset id */
hid_t sid; /* space id */
hid_t aid; /* attribute id */
hid_t tid; /* datatype id */
hid_t gcpl_id; /* group creation property list ID */
hid_t dcpl_id; /* dataset creation property list ID */
hid_t tcpl_id; /* datatype creation property list ID */
int i;
const char *attr_name[3] = {"c", "b", "a" };
@ -5928,29 +5930,38 @@ gent_attr_creation_order(void)
if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
goto out;
/* enable creation order tracking on attributes */
/* create dataset creation property list */
if((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0)
goto out;
/* enable attribute creation order tracking on dataset property list */
if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
goto out;
/* enable creation order tracking on groups */
if(H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
/* enable attribute creation order tracking on group property list */
if(H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
goto out;
/* enable attribute creation order tracking on datatype property list */
if(H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
goto out;
/* create a dataspace */
if((sid = H5Screate(H5S_SCALAR)) < 0)
goto out;
/*-------------------------------------------------------------------------
* create a dataset and atributes in it
*-------------------------------------------------------------------------
*/
/* create dataspace for dataset */
if((sid = H5Screate(H5S_SCALAR)) < 0)
goto out;
/* create a dataset */
if((did = H5Dcreate(fid, "dset", H5T_NATIVE_UCHAR, sid, dcpl_id)) < 0)
goto out;
/* add attributes */
for(i = 0; i < 3; i++) {
for(i = 0; i < 3; i++)
{
if((aid = H5Acreate2(did, ".", attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto out;
@ -5958,41 +5969,75 @@ gent_attr_creation_order(void)
if(H5Aclose(aid) < 0)
goto out;
} /* end for */
if (H5Dclose(did) < 0)
goto out;
/*-------------------------------------------------------------------------
* create a group and atributes in it
*-------------------------------------------------------------------------
*/
if((gid = H5Gcreate2(fid, "g", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
if ((gid = H5Gcreate2(fid, "g", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
goto out;
/* add attributes */
for(i = 0; i < 3; i++) {
if((aid = H5Acreate2(gid, ".", attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
for(i = 0; i < 3; i++)
{
if ((aid = H5Acreate2(gid, ".", attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto out;
/* close attribute */
if(H5Aclose(aid) < 0)
if (H5Aclose(aid) < 0)
goto out;
} /* end for */
if (H5Gclose(gid) < 0)
goto out;
/*-------------------------------------------------------------------------
* create a named datatype and atributes in it
*-------------------------------------------------------------------------
*/
if ((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
goto out;
if ((H5Tcommit2(fid, "t", tid, H5P_DEFAULT, tcpl_id, H5P_DEFAULT)) < 0)
goto out;
/* add attributes */
for(i = 0; i < 3; i++)
{
if ((aid = H5Acreate2(tid, ".", attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto out;
/* close attribute */
if (H5Aclose(aid) < 0)
goto out;
} /* end for */
if (H5Tclose(tid) < 0)
goto out;
/* close */
if(H5Sclose(sid) < 0)
goto out;
if(H5Pclose(dcpl_id) < 0)
goto out;
if(H5Pclose(gcpl_id) < 0)
goto out;
if(H5Fclose(fid) < 0)
if (H5Pclose(tcpl_id) < 0)
goto out;
if (H5Fclose(fid) < 0)
goto out;
return;

2
tools/h5dump/testh5dump.sh.in
View File

@ -483,7 +483,7 @@ TOOLTEST tordergr3.ddl -g 2 -q name -z ascending tordergr.h5
TOOLTEST tordergr4.ddl -g 2 -q name -z descending tordergr.h5
TOOLTEST tordergr5.ddl -q creation_order tordergr.h5
# tests for dataset attribute order
# tests for attribute order
TOOLTEST torderattr1.ddl -H --sort_by=name --sort_order=ascending torderattr.h5
TOOLTEST torderattr2.ddl -H --sort_by=name --sort_order=descending torderattr.h5
TOOLTEST torderattr3.ddl -H --sort_by=creation_order --sort_order=ascending torderattr.h5

BIN
tools/testfiles/torderattr.h5
View File

Binary file not shown.

14
tools/testfiles/torderattr1.ddl
View File

@ -33,5 +33,19 @@ GROUP "/" {
DATASPACE SCALAR
}
}
DATATYPE "t" H5T_STD_I32LE;
ATTRIBUTE "a" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "b" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
}
}

14
tools/testfiles/torderattr2.ddl
View File

@ -3,6 +3,20 @@ Expected output for 'h5dump -H --sort_by=name --sort_order=descending torderattr
#############################
HDF5 "torderattr.h5" {
GROUP "/" {
DATATYPE "t" H5T_STD_I32LE;
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "b" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "a" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
GROUP "g" {
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE

16
tools/testfiles/torderattr3.ddl
View File

@ -20,6 +20,20 @@ GROUP "/" {
}
}
GROUP "g" {
ATTRIBUTE "a" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "b" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
}
DATATYPE "t" H5T_STD_I32LE;
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
@ -32,6 +46,6 @@ GROUP "/" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
}
}
}

16
tools/testfiles/torderattr4.ddl
View File

@ -3,7 +3,7 @@ Expected output for 'h5dump -H --sort_by=creation_order --sort_order=descending
#############################
HDF5 "torderattr.h5" {
GROUP "/" {
GROUP "g" {
DATATYPE "t" H5T_STD_I32LE;
ATTRIBUTE "a" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
@ -16,6 +16,20 @@ GROUP "/" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
GROUP "g" {
ATTRIBUTE "c" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "b" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
ATTRIBUTE "a" {
DATATYPE H5T_STD_U8LE
DATASPACE SCALAR
}
}
DATASET "dset" {
DATATYPE H5T_STD_U8LE