Commit df8fe71a authored by kalle's avatar kalle Committed by Philip Carns

runtime hdf5: Fix for HDF5 1.10 hid_t uint64_t

Signed-off-by: Philip Carns's avatarPhil Carns <carns@mcs.anl.gov>
parent 7ec53306
...@@ -46,6 +46,13 @@ AC_ARG_ENABLE(group-readable-logs, ...@@ -46,6 +46,13 @@ AC_ARG_ENABLE(group-readable-logs,
fi] fi]
,) ,)
AC_ARG_ENABLE(HDF5_1.10,
[ --enable-HDF5_1.10 Compile for use with HDF5 1.10.x],
[if test "x$enableval" = "xyes" ; then
AC_DEFINE(__DARSHAN_ENABLE_HDF5110, 1, Set for compatibility with HDF5_1.10.x, breaks use with 1.8.x)
fi]
,)
AC_ARG_ENABLE( AC_ARG_ENABLE(
[bgq-mod], [bgq-mod],
[ --disable-bgq-mod Disables compilation and use of BG/Q module (for BG/Q systems)], [ --disable-bgq-mod Disables compilation and use of BG/Q module (for BG/Q systems)],
......
...@@ -25,8 +25,13 @@ ...@@ -25,8 +25,13 @@
#include "darshan-dynamic.h" #include "darshan-dynamic.h"
/* hope this doesn't change any time soon */ /* hope this doesn't change any time soon */
typedef int hid_t; typedef int herr_t; //hf5-1.10.0p1: H5public.h:126
typedef int herr_t;
#ifdef __DARSHAN_ENABLE_HDF5110
typedef int64_t hid_t; //hf5-1.10.0p1: H5Ipublic.h:56
#else
typedef int hid_t;
#endif
DARSHAN_FORWARD_DECL(H5Fcreate, hid_t, (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist)); DARSHAN_FORWARD_DECL(H5Fcreate, hid_t, (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist));
DARSHAN_FORWARD_DECL(H5Fopen, hid_t, (const char *filename, unsigned flags, hid_t access_plist)); DARSHAN_FORWARD_DECL(H5Fopen, hid_t, (const char *filename, unsigned flags, hid_t access_plist));
...@@ -112,7 +117,7 @@ static int my_rank = -1; ...@@ -112,7 +117,7 @@ static int my_rank = -1;
hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags, hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags,
hid_t create_plist, hid_t access_plist) hid_t create_plist, hid_t access_plist)
{ {
int ret; hid_t ret;
char* tmp; char* tmp;
double tm1; double tm1;
...@@ -143,7 +148,7 @@ hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags, ...@@ -143,7 +148,7 @@ hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags,
hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags, hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags,
hid_t access_plist) hid_t access_plist)
{ {
int ret; hid_t ret;
char* tmp; char* tmp;
double tm1; double tm1;
...@@ -175,7 +180,7 @@ hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags, ...@@ -175,7 +180,7 @@ hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags,
herr_t DARSHAN_DECL(H5Fclose)(hid_t file_id) herr_t DARSHAN_DECL(H5Fclose)(hid_t file_id)
{ {
struct hdf5_file_record_ref *rec_ref; struct hdf5_file_record_ref *rec_ref;
int ret; herr_t ret;
MAP_OR_FAIL(H5Fclose); MAP_OR_FAIL(H5Fclose);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment