--- ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8 2008-07-16 11:24:23.000000000 -0600 +++ ParaView3.2.2/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 11:54:06.000000000 -0600 @@ -132,9 +132,15 @@ static herr_t H5FD_dsm_flush(H5FD_t *_file); #endif static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); +static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); +static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); +#else static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); +#endif static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, DSM_HSIZE_T size, void *buf); static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, @@ -594,7 +600,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type) +#else H5FD_dsm_get_eoa(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -622,7 +632,11 @@ *------------------------------------------------------------------------- */ static herr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) +#else H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -663,7 +677,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eof(const H5FD_t *_file) +#else H5FD_dsm_get_eof(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file;

--- ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8.2 2009-02-24 14:13:53.000000000 -0700 +++ ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-02-24 15:34:49.000000000 -0700 @@ -133,9 +133,15 @@ static herr_t H5FD_dsm_flush(H5FD_t *_file); #endif static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); +static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); +static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); +#else static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); +#endif static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, DSM_HSIZE_T size, void *buf); static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, @@ -160,6 +166,9 @@ H5FD_dsm_close, /*close */ H5FD_dsm_cmp, /*cmp */ NULL, /*query */ +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) + NULL, /*get_type_map */ +#endif NULL, /*alloc */ NULL, /*free */ H5FD_dsm_get_eoa, /*get_eoa */ @@ -169,6 +178,9 @@ H5FD_dsm_read, /*read */ H5FD_dsm_write, /*write */ NULL, /*flush */ +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) + NULL, /*truncate */ +#endif NULL, /*lock */ NULL, /*unlock */ H5FD_FLMAP_SINGLE /*fl_map */ @@ -595,7 +607,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type) +#else H5FD_dsm_get_eoa(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -623,7 +639,11 @@ *------------------------------------------------------------------------- */ static herr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) +#else H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -664,7 +684,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eof(const H5FD_t *_file) +#else H5FD_dsm_get_eof(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file;

Notes
(0012548) Orion E. Poplawski (reporter) 2008-06-26 18:31	Also: --- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h.hdf5 2007-11-07 13:51:40.000000000 -0700 +++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfH5Driver.h 2008-06-26 16:31:16.000000000 -0600 @@ -27,7 +27,7 @@ #include "XdmfDsmBuffer.h" #include "H5Ipublic.h" -#include "H5pubconf.h" +#include "H5public.h" #include "XdmfExport.h" From the notes in H5public.h: /* Include files for public use... / / * Since H5pubconf.h is a generated header file, it is messy to try * to put a #ifndef _H5pubconf_H ... #endif guard in it. * HDF5 has set an internal rule that it is being included here. * Source files should NOT include H5pubconf.h directly but include * it via H5public.h. The #ifndef _H5public_H guard above would * prevent repeated include. / #include "H5pubconf.h" /from configure */ This also helps because the Fedora HDF5 packages rename H5pubconf.h to allow for multi-arch installs.

(0012624) John Biddiscombe (developer) 2008-07-04 10:16	I've committed the path because it's ok, but I still have other errors, so I'm adding ADD_DEFINITIONS(-DH5_USE_16_API) to the xdmf cmakelists. This get's my compilation working for now with hdf 1.8.1

(0012717) Orion E. Poplawski (reporter) 2008-07-15 19:17	Yeah, I use -DH5_USE_16_API as well. Thanks for the fix.

(0012725) Orion E. Poplawski (reporter) 2008-07-16 13:48	Some more changes are needed when building an mpi version. I'll attach a patch.

(0015431) Orion E. Poplawski (reporter) 2009-02-26 14:02	Updated patch to support HDF 1.8.2

(0022285) Orion Poplawski (reporter) 2010-09-20 17:58	Utilities/Xdmf2/libsrc/XdmfH5Driver.h still includes H5pubconf.h instead of H5public.h.

(0025084) David Partyka (developer) 2011-01-26 09:26	ParaView 3.8.1 shipped with HDF5 1.8.5 (though we missed enabling hdf5+zlib compression, which is also addressed). The Utilities/Xdmf2/libsrc/XdmfH5Driver.h has been addressed.

(0025411) Alan Scott (manager) 2011-02-11 21:42	Agreed.

Issue History
Date Modified	Username	Field	Change
2008-05-14 16:29	Orion Poplawski	New Issue
2008-05-14 16:29	Orion Poplawski	File Added: paraview-3.2.1-hdf5.patch
2008-06-26 18:31	Orion E. Poplawski	Note Added: 0012548
2008-07-04 09:35	John Biddiscombe	Status	backlog => tabled
2008-07-04 09:35	John Biddiscombe	Assigned To	=> John Biddiscombe
2008-07-04 10:16	John Biddiscombe	Note Added: 0012624
2008-07-15 19:17	Orion E. Poplawski	Note Added: 0012717
2008-07-16 13:48	Orion E. Poplawski	Note Added: 0012725
2008-07-16 13:49	Orion E. Poplawski	File Added: paraview-3.2.2-hdf5-1.8.patch
2009-02-26 14:02	Orion E. Poplawski	Note Added: 0015431
2009-02-26 14:03	Orion E. Poplawski	File Added: paraview-3.4.0-hdf5-1.8.2.patch
2010-09-20 17:58	Orion Poplawski	Note Added: 0022285
2011-01-26 09:26	David Partyka	Note Added: 0025084
2011-01-26 09:26	David Partyka	Status	tabled => @80@
2011-01-26 09:26	David Partyka	Fixed in Version	=> 3.8.1
2011-01-26 09:26	David Partyka	Resolution	open => fixed
2011-02-11 21:42	Alan Scott	Note Added: 0025411
2011-02-11 21:42	Alan Scott	Status	@80@ => closed
2011-06-16 13:10	Zack Galbreath	Category	=> (No Category)

Relationships