1
0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-10-02 06:21:05 +02:00

more portable HDF5 back end

This commit is contained in:
q-posev 2021-05-04 20:22:58 +02:00
parent 5f4f94646f
commit 9c2b240418
2 changed files with 24 additions and 21 deletions

View File

@ -22,8 +22,6 @@
#+end_src
DOCUMENT HDF5 BACK END HERE
#+begin_src c :tangle prefix_hdf5.h :noweb yes
<<header>>
@ -304,8 +302,7 @@ trexio_hdf5_read_$group$_$group_dset$ (trexio_t* const file, $group_dset_dtype$*
herr_t status;
int rrank;
// get the rank of the dataset in a file
status = H5LTget_dataset_ndims (f->$group$_group, $GROUP$_$GROUP_DSET$_NAME,
&rrank);
status = H5LTget_dataset_ndims (f->$group$_group, $GROUP$_$GROUP_DSET$_NAME, &rrank);
if (status < 0) return TREXIO_FAILURE;
@ -337,8 +334,9 @@ trexio_hdf5_read_$group$_$group_dset$ (trexio_t* const file, $group_dset_dtype$*
free(ddims);
/* High-level H5LT API. No need to deal with dataspaces and datatypes */
status = H5LTread_dataset_$group_dset_h5_dtype$(f->$group$_group,
status = H5LTread_dataset(f->$group$_group,
$GROUP$_$GROUP_DSET$_NAME,
H5T_NATIVE_$GROUP_DSET_H5_DTYPE$,
$group_dset$);
if (status < 0) return TREXIO_FAILURE;
@ -365,9 +363,11 @@ trexio_hdf5_write_$group$_$group_dset$ (trexio_t* const file, const $group_dset_
if ( H5LTfind_dataset(f->$group$_group, $GROUP$_$GROUP_DSET$_NAME) != 1 ) {
const herr_t status =
H5LTmake_dataset_$group_dset_h5_dtype$ (f->$group$_group, $GROUP$_$GROUP_DSET$_NAME,
(int) rank, (const hsize_t*) dims, $group_dset$);
const herr_t status = H5LTmake_dataset(f->$group$_group,
$GROUP$_$GROUP_DSET$_NAME,
(int) rank, (const hsize_t*) dims,
H5T_NATIVE_$GROUP_DSET_H5_DTYPE$,
$group_dset$);
if (status < 0) return TREXIO_FAILURE;
} else {
@ -375,9 +375,10 @@ trexio_hdf5_write_$group$_$group_dset$ (trexio_t* const file, const $group_dset_
hid_t dset_id = H5Dopen(f->$group$_group, $GROUP$_$GROUP_DSET$_NAME, H5P_DEFAULT);
if (dset_id <= 0) return TREXIO_INVALID_ID;
const herr_t status =
H5Dwrite(dset_id, H5T_NATIVE_$GROUP_DSET_H5_DTYPE$, H5S_ALL, H5S_ALL,
H5P_DEFAULT, $group_dset$);
const herr_t status = H5Dwrite(dset_id,
H5T_NATIVE_$GROUP_DSET_H5_DTYPE$,
H5S_ALL, H5S_ALL, H5P_DEFAULT,
$group_dset$);
H5Dclose(dset_id);
if (status < 0) return TREXIO_FAILURE;
@ -417,3 +418,5 @@ trexio_hdf5_has_$group$_$group_dset$ (trexio_t* const file)
#endif
#+end_src

View File

@ -288,7 +288,7 @@ for fname in files_funcs_dsets:
c_dtype_single = 'float'
elif params['dtype'] == 'int64_t':
h5_dtype = 'long'
h5_dtype = 'int64'
f_dtype_double = 'integer(8)'
f_dtype_single = 'integer(4)'
c_dtype_double = 'int64_t'