Changeset bf3ce2c

Timestamp:

Jan 29, 2019, 3:58:40 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

befee7a

Parents:

e18c30e

Message:

[file_hdf5] check if tensor exists before loading, double precision support, improve debug output

File:

• src/io/file_hdf5.c (modified) (4 diffs)

src/io/file_hdf5.c

@@ -30 +30 @@
 #include <hdf5_hl.h>
 
+#if !HAVE_AUBIO_DOUBLE
+#define aubio_H5LTread_dataset_smpl H5LTread_dataset_float
+#else
+#define aubio_H5LTread_dataset_smpl H5LTread_dataset_double
+#endif
+
 struct _aubio_file_hdf5_t {
   const char_t *path;
@@ -52 +58 @@
 
 uint_t aubio_file_hdf5_load_dataset_into_tensor (aubio_file_hdf5_t *f,
-    const char_t *key, aubio_tensor_t *tensor) {
+    const char_t *key, aubio_tensor_t *tensor)
+{
   uint_t i;
   AUBIO_ASSERT(f && key && tensor);
-  // check file is open
-  if (!f->fid)
+  // check arguments
+  if (!f->fid || !key || !tensor)
     return AUBIO_FAIL;
   // find key in file
@@ -76 +83 @@
   AUBIO_ASSERT(ndim == (sint_t)tensor->ndim);
   for (i = 0; i < (uint_t)ndim; i++) {
-    //AUBIO_DBG("file_hdf5: found dim %d : %d %d (%s in %s)\n", i, dims[i],
-    //    tensor->shape[i], key, f->path);
     AUBIO_ASSERT(shape[i] == tensor->shape[i]);
   }
@@ -88 +93 @@
   // read data from hdf5 file into tensor buffer
   smpl_t *buffer = tensor->buffer;
-  herr_t err = H5LTread_dataset_float(f->fid, key, buffer);
+  herr_t err = aubio_H5LTread_dataset_smpl(f->fid, key, buffer);
 
   if (err < 0) {
     return AUBIO_FAIL;
   }
+
+  //AUBIO_DBG("file_hdf5: loaded : shape %s from key %s\n",
+  //    aubio_tensor_get_shape_string(tensor), key);
 
   H5Dclose(data_id);