Commit 78ac2f29 authored by Shane Snyder's avatar Shane Snyder

Merge branch 'issue-217-hdf5-1.10' into 'master'

Issue 217 hdf5 1.10

Adds manual configure script option to update HDF5 types to match HDF5 1.10+ as reported/contributed by Karl-Ulrich Bamberg

See merge request !4
parents 7ec53306 0fc92ecb
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
Darshan Release Change Log Darshan Release Change Log
-------------------------- --------------------------
Darshan-3.1.3-pre1
=============
* add --enable-HDF5_1.10 configure option to explicitly enable HDF5 1.10+
support, needed on some platforms for API compatibility
- contributed by Karl-Ulrich Bamberg
Darshan-3.1.2 Darshan-3.1.2
============= =============
* bug fix in resolving underlying call to fopen64 when using the LD_PRELOAD * bug fix in resolving underlying call to fopen64 when using the LD_PRELOAD
......
...@@ -663,7 +663,6 @@ infodir ...@@ -663,7 +663,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -690,6 +689,7 @@ with_zlib ...@@ -690,6 +689,7 @@ with_zlib
enable_ld_preload enable_ld_preload
enable_cuserid enable_cuserid
enable_group_readable_logs enable_group_readable_logs
enable_HDF5_1_10
enable_bgq_mod enable_bgq_mod
enable_lustre_mod enable_lustre_mod
enable_mmap_logs enable_mmap_logs
...@@ -747,7 +747,6 @@ datadir='${datarootdir}' ...@@ -747,7 +747,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1000,15 +999,6 @@ do ...@@ -1000,15 +999,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1146,7 +1136,7 @@ fi ...@@ -1146,7 +1136,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1299,7 +1289,6 @@ Fine tuning of the installation directories: ...@@ -1299,7 +1289,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -1333,6 +1322,7 @@ Optional Features: ...@@ -1333,6 +1322,7 @@ Optional Features:
--disable-cuserid Disables attempted use of cuserid() at run time --disable-cuserid Disables attempted use of cuserid() at run time
--enable-group-readable-logs --enable-group-readable-logs
Set log files to be group readable Set log files to be group readable
--enable-HDF5_1.10 Enable explicit support for HDF5 1.10.x API
--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)
--disable-lustre-mod Disables compilation and use of the Lustre module --disable-lustre-mod Disables compilation and use of the Lustre module
--enable-mmap-logs Enables ability to mmap I/O data to log file --enable-mmap-logs Enables ability to mmap I/O data to log file
...@@ -3581,6 +3571,17 @@ fi ...@@ -3581,6 +3571,17 @@ fi
fi fi
# Check whether --enable-HDF5_1.10 was given.
if test "${enable_HDF5_1_10+set}" = set; then :
enableval=$enable_HDF5_1_10; if test "x$enableval" = "xyes" ; then
$as_echo "#define __DARSHAN_ENABLE_HDF5110 1" >>confdefs.h
fi
fi
# Check whether --enable-bgq-mod was given. # Check whether --enable-bgq-mod was given.
if test "${enable_bgq_mod+set}" = set; then : if test "${enable_bgq_mod+set}" = set; then :
enableval=$enable_bgq_mod; enableval=$enable_bgq_mod;
......
...@@ -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 Enable explicit support for HDF5 1.10.x API],
[if test "x$enableval" = "xyes" ; then
AC_DEFINE(__DARSHAN_ENABLE_HDF5110, 1, Explicitly enable HDF5_1.10.x support, will break 1.8.x compatibility on 32bit platforms)
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)],
......
...@@ -87,6 +87,9 @@ ...@@ -87,6 +87,9 @@
/* Define if cuserid() should be disabled */ /* Define if cuserid() should be disabled */
#undef __DARSHAN_DISABLE_CUSERID #undef __DARSHAN_DISABLE_CUSERID
/* Explicitly enable HDF5_1.10.x support */
#undef __DARSHAN_ENABLE_HDF5110
/* Define if Darshan should mmap data structures to log file */ /* Define if Darshan should mmap data structures to log file */
#undef __DARSHAN_ENABLE_MMAP_LOGS #undef __DARSHAN_ENABLE_MMAP_LOGS
......
...@@ -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