mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-12-27 08:01:04 +08:00
14dcb6db33
Add "use the latest format" support for dataspace object header encode/
decode routines and clean up format a bit for the latest format (new to 1.8.x
releases)
Remove storing 'perm' parameter for array datatypes in memory and the file,
and add test to make certain that if any user applications are attempting to
store them, we get some reports back. (Should be unlikely, since the RefMan
says that the parameter is not implemented and is unsupported).
Carry those changes into the tests, etc.
Clean up a bunch more compiler warnings.
Tested on:
FreeBSD/32 4.11 (sleipnir) w/threadsafe
Linux/32 2.4 (heping) w/FORTRAN & C++
Linux/64 2.4 (mir) w/enable-1.6-compat
232 lines
9.9 KiB
XML
232 lines
9.9 KiB
XML
#############################
|
|
Expected output for 'h5dump --xml tcompound2.h5'
|
|
#############################
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
|
|
<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
|
|
<hdf5:NamedDataType Name="#9560" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
|
|
<hdf5:DataType>
|
|
<hdf5:CompoundType>
|
|
<hdf5:Field FieldName="int">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="float">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
</hdf5:CompoundType>
|
|
</hdf5:DataType>
|
|
</hdf5:NamedDataType>
|
|
<hdf5:NamedDataType Name="type1" OBJ-XID="xid_3280" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
|
|
<hdf5:DataType>
|
|
<hdf5:CompoundType>
|
|
<hdf5:Field FieldName="int_name">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="float_name">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
</hdf5:CompoundType>
|
|
</hdf5:DataType>
|
|
</hdf5:NamedDataType>
|
|
<hdf5:NamedDataType Name="type2" OBJ-XID="xid_6544" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
|
|
<hdf5:DataType>
|
|
<hdf5:CompoundType>
|
|
<hdf5:Field FieldName="int_array">
|
|
<hdf5:DataType>
|
|
<hdf5:ArrayType Ndims="1">
|
|
<hdf5:ArrayDimension DimSize="4"/>
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:ArrayType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="float_array">
|
|
<hdf5:DataType>
|
|
<hdf5:ArrayType Ndims="2">
|
|
<hdf5:ArrayDimension DimSize="5"/>
|
|
<hdf5:ArrayDimension DimSize="6"/>
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:ArrayType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
</hdf5:CompoundType>
|
|
</hdf5:DataType>
|
|
</hdf5:NamedDataType>
|
|
<hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
|
|
<hdf5:StorageLayout>
|
|
<hdf5:ChunkedLayout Ndims="1">
|
|
<hdf5:ChunkDimension DimSize="2" />
|
|
<hdf5:RequiredFilter>
|
|
</hdf5:RequiredFilter>
|
|
</hdf5:ChunkedLayout>
|
|
</hdf5:StorageLayout>
|
|
<hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
|
|
<hdf5:FillValue>
|
|
<hdf5:NoFill/>
|
|
</hdf5:FillValue>
|
|
</hdf5:FillValueInfo>
|
|
<hdf5:Dataspace>
|
|
<hdf5:SimpleDataspace Ndims="1">
|
|
<hdf5:Dimension DimSize="6" MaxDimSize="UNLIMITED"/>
|
|
</hdf5:SimpleDataspace>
|
|
</hdf5:Dataspace>
|
|
<hdf5:DataType>
|
|
<hdf5:CompoundType>
|
|
<hdf5:Field FieldName="a_name">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="b_name">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="c_name">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="8" SignBitLocation="63" ExponentBits="11" ExponentLocation="52" MantissaBits="52" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
</hdf5:CompoundType>
|
|
</hdf5:DataType>
|
|
<!-- Note: format of compound data not specified -->
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
0 0 1 1 1 0.5 2 4 0.333333 3 9 0.25 4 16 0.2 5 25 0.166667
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Dataset>
|
|
<hdf5:Group Name="group1" OBJ-XID="xid_3960" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" >
|
|
<hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624" H5Path="/group1/type3" Parents="xid_3960" H5ParentPaths="/group1">
|
|
<hdf5:DataType>
|
|
<hdf5:CompoundType>
|
|
<hdf5:Field FieldName="int">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
<hdf5:Field FieldName="float">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:Field>
|
|
</hdf5:CompoundType>
|
|
</hdf5:DataType>
|
|
</hdf5:NamedDataType>
|
|
<hdf5:Dataset Name="dset2" OBJ-XID="xid_4008" H5Path= "/group1/dset2" Parents="xid_3960" H5ParentPaths="/group1">
|
|
<hdf5:StorageLayout>
|
|
<hdf5:ChunkedLayout Ndims="1">
|
|
<hdf5:ChunkDimension DimSize="2" />
|
|
<hdf5:RequiredFilter>
|
|
</hdf5:RequiredFilter>
|
|
</hdf5:ChunkedLayout>
|
|
</hdf5:StorageLayout>
|
|
<hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
|
|
<hdf5:FillValue>
|
|
<hdf5:NoFill/>
|
|
</hdf5:FillValue>
|
|
</hdf5:FillValueInfo>
|
|
<hdf5:Dataspace>
|
|
<hdf5:SimpleDataspace Ndims="1">
|
|
<hdf5:Dimension DimSize="6" MaxDimSize="10"/>
|
|
</hdf5:SimpleDataspace>
|
|
</hdf5:Dataspace>
|
|
<hdf5:NamedDataTypePtr OBJ-XID="xid_3280" H5Path="/type1" />
|
|
<!-- Note: format of compound data not specified -->
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
0 0 1 1.1 2 2.2 3 3.3 4 4.4 5 5.5
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Dataset>
|
|
<hdf5:Dataset Name="dset4" OBJ-XID="xid_6704" H5Path= "/group1/dset4" Parents="xid_3960" H5ParentPaths="/group1">
|
|
<hdf5:StorageLayout>
|
|
<hdf5:ChunkedLayout Ndims="1">
|
|
<hdf5:ChunkDimension DimSize="2" />
|
|
<hdf5:RequiredFilter>
|
|
</hdf5:RequiredFilter>
|
|
</hdf5:ChunkedLayout>
|
|
</hdf5:StorageLayout>
|
|
<hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
|
|
<hdf5:FillValue>
|
|
<hdf5:NoFill/>
|
|
</hdf5:FillValue>
|
|
</hdf5:FillValueInfo>
|
|
<hdf5:Dataspace>
|
|
<hdf5:SimpleDataspace Ndims="1">
|
|
<hdf5:Dimension DimSize="6" MaxDimSize="10"/>
|
|
</hdf5:SimpleDataspace>
|
|
</hdf5:Dataspace>
|
|
<hdf5:NamedDataTypePtr OBJ-XID="xid_6624" H5Path="/group1/type3" />
|
|
<!-- Note: format of compound data not specified -->
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
0 0 1 1 2 2 3 3 4 4 5 5
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Dataset>
|
|
</hdf5:Group>
|
|
<hdf5:Group Name="group2" OBJ-XID="xid_9512" H5Path="/group2" Parents="xid_696" H5ParentPaths="/" >
|
|
<hdf5:Dataset Name="dset5" OBJ-XID="xid_9968" H5Path= "/group2/dset5" Parents="xid_9512" H5ParentPaths="/group2">
|
|
<hdf5:StorageLayout>
|
|
<hdf5:ChunkedLayout Ndims="1">
|
|
<hdf5:ChunkDimension DimSize="2" />
|
|
<hdf5:RequiredFilter>
|
|
</hdf5:RequiredFilter>
|
|
</hdf5:ChunkedLayout>
|
|
</hdf5:StorageLayout>
|
|
<hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Incremental">
|
|
<hdf5:FillValue>
|
|
<hdf5:NoFill/>
|
|
</hdf5:FillValue>
|
|
</hdf5:FillValueInfo>
|
|
<hdf5:Dataspace>
|
|
<hdf5:SimpleDataspace Ndims="1">
|
|
<hdf5:Dimension DimSize="6" MaxDimSize="10"/>
|
|
</hdf5:SimpleDataspace>
|
|
</hdf5:Dataspace>
|
|
<hdf5:NamedDataTypePtr OBJ-XID="xid_9968"/>
|
|
<!-- Note: format of compound data not specified -->
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
0 0 1 1 2 2 3 3 4 4 5 5
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Dataset>
|
|
</hdf5:Group>
|
|
</hdf5:RootGroup>
|
|
</hdf5:HDF5-File>
|