Mercurial > forge
changeset 11278:2deb6b24d293 octave-forge
Use HAVE_HDF5_18 macro to account for HDF5 API changes
| author | jordigh |
|---|---|
| date | Fri, 30 Nov 2012 20:13:45 +0000 |
| parents | 7b7cd174847c |
| children | 442cb00e506b |
| files | main/fixed/src/ov-fixed-complex.cc main/fixed/src/ov-fixed-cx-mat.cc main/fixed/src/ov-fixed-mat.cc main/fixed/src/ov-fixed.cc |
| diffstat | 4 files changed, 180 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/main/fixed/src/ov-fixed-complex.cc Fri Nov 30 20:11:09 2012 +0000 +++ b/main/fixed/src/ov-fixed-complex.cc Fri Nov 30 20:13:45 2012 +0000 @@ -349,7 +349,13 @@ bool save_as_floats) { hid_t group_hid = -1; + +#if HAVE_HDF5_18 group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); +#else + group_hid = H5Gcreate (loc_id, name, 0); +#endif + if (group_hid < 0 ) return false; hsize_t dims[3]; @@ -371,8 +377,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -396,8 +407,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -429,8 +445,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -461,12 +482,22 @@ hid_t group_hid, data_hid, type_hid, space_id; hsize_t rank; +#if HAVE_HDF5_18 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); +#else + group_hid = H5Gopen (loc_id, name); +#endif + if (group_hid < 0 ) return false; hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UCHAR, 1); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "int"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ -502,7 +533,13 @@ H5Tclose(type_hid); H5Dclose (data_hid); + +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "dec"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ -542,7 +579,13 @@ complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, sizeof(unsigned int)); + +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "num"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type))
--- a/main/fixed/src/ov-fixed-cx-mat.cc Fri Nov 30 20:11:09 2012 +0000 +++ b/main/fixed/src/ov-fixed-cx-mat.cc Fri Nov 30 20:13:45 2012 +0000 @@ -616,7 +616,13 @@ bool save_as_floats) { hid_t group_hid = -1; + +#if HAVE_HDF5_18 group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); +#else + group_hid = H5Gcreate (loc_id, name, 0); +#endif + if (group_hid < 0 ) return false; dim_vector d = dims (); @@ -644,8 +650,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -672,8 +683,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -709,8 +725,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -743,13 +764,23 @@ hid_t group_hid, data_hid, space_id, type_hid; hsize_t rank, rank_old; +#if HAVE_HDF5_18 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); +#else + group_hid = H5Gopen (loc_id, name); +#endif + if (group_hid < 0 ) return false; hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, sizeof(unsigned int)); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "int"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ -813,7 +844,12 @@ H5Tclose(type_hid); H5Dclose (data_hid); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "dec"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type)) @@ -878,7 +914,12 @@ H5Tclose(type_hid); H5Dclose (data_hid); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "num"); +#endif + type_hid = H5Dget_type (data_hid); if (! hdf5_types_compatible (type_hid, complex_type))
--- a/main/fixed/src/ov-fixed-mat.cc Fri Nov 30 20:11:09 2012 +0000 +++ b/main/fixed/src/ov-fixed-mat.cc Fri Nov 30 20:13:45 2012 +0000 @@ -574,7 +574,13 @@ octave_fixed_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { hid_t group_hid = -1; + +#if HAVE_HDF5_18 group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); +#else + group_hid = H5Gcreate (loc_id, name, 0); +#endif + if (group_hid < 0 ) return false; dim_vector d = dims (); @@ -594,8 +600,14 @@ return false; } - data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#if HAVE_HDF5_18 + data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -617,8 +629,14 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -639,8 +657,14 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, + H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -668,10 +692,20 @@ hid_t group_hid, data_hid, space_id; hsize_t rank, rank_old; +#if HAVE_HDF5_18 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); +#else + group_hid = H5Gopen (loc_id, name); +#endif + if (group_hid < 0 ) return false; +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "int"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); rank_old = rank; @@ -719,7 +753,12 @@ } H5Dclose (data_hid); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "dec"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ -766,7 +805,12 @@ } H5Dclose (data_hid); +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "num"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id);
--- a/main/fixed/src/ov-fixed.cc Fri Nov 30 20:11:09 2012 +0000 +++ b/main/fixed/src/ov-fixed.cc Fri Nov 30 20:13:45 2012 +0000 @@ -291,7 +291,11 @@ octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { hid_t group_hid = -1; - group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT); +#if HAVE_HDF5_18 + group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + group_hid = H5Gcreate (loc_id, name, 0); +#endif if (group_hid < 0 ) return false; hsize_t dims[3]; @@ -306,9 +310,13 @@ H5Gclose (group_hid); return false; } - - data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#if HAVE_HDF5_18 + data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -327,8 +335,14 @@ return false; } - data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#if HAVE_HDF5_18 + data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, + H5P_DEFAULT); +#endif + if (data_hid < 0) { H5Sclose (space_hid); @@ -347,8 +361,13 @@ return false; } +#if HAVE_HDF5_18 data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else + data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, + H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -374,10 +393,20 @@ hid_t group_hid, data_hid, space_id; hsize_t rank; +#if HAVE_HDF5_18 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT); +#else + group_hid = H5Gopen (loc_id, name); +#endif + if (group_hid < 0 ) return false; +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "nr"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ -398,7 +427,13 @@ H5Dclose (data_hid); + +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "dec"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id); @@ -418,7 +453,13 @@ } H5Dclose (data_hid); + +#if HAVE_HDF5_18 data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT); +#else + data_hid = H5Dopen (group_hid, "num"); +#endif + space_id = H5Dget_space (data_hid); rank = H5Sget_simple_extent_ndims (space_id);