Compare commits

...

4 Commits

Author SHA1 Message Date
gsell 1c8a5dd0d1 MPIPOSIX removed, this has been removed in hdf5 1.8.13, so we cannot use it any more 2015-06-12 14:49:10 +02:00
gsell 64f8552443 src/h5core/h5b_readwrite.c:
- fix early return in  _select_hyperslab_for_writing()
2015-06-12 14:44:31 +02:00
gsell da1ceec4f5 configure.ac:
- set version to 1.99.14
2015-04-16 18:21:35 +02:00
gsell b12b39dedf src/h5core/h5b_model.c:
- bugfix in serial code of h5b_3d_set_view()
2015-04-16 18:21:09 +02:00
7 changed files with 18 additions and 8 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
AC_INIT([H5hut], [1.99.13], [h5part@lists.psi.ch], H5hut) AC_INIT([H5hut], [1.99.14], [h5part@lists.psi.ch], H5hut)
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
+2
View File
@@ -925,6 +925,7 @@ hdf5_set_fapl_mpio_property (
HDF5_WRAPPER_RETURN (H5_SUCCESS); HDF5_WRAPPER_RETURN (H5_SUCCESS);
} }
#if H5_VERSION_LE(1,8,12)
static inline h5_err_t static inline h5_err_t
hdf5_set_fapl_mpiposix_property ( hdf5_set_fapl_mpiposix_property (
hid_t fapl_id, hid_t fapl_id,
@@ -942,6 +943,7 @@ hdf5_set_fapl_mpiposix_property (
" the file access property list.")); " the file access property list."));
HDF5_WRAPPER_RETURN (H5_SUCCESS); HDF5_WRAPPER_RETURN (H5_SUCCESS);
} }
#endif
static inline h5_err_t static inline h5_err_t
hdf5_set_dxpl_mpio_property ( hdf5_set_dxpl_mpio_property (
+4 -1
View File
@@ -139,11 +139,14 @@ h5_err_t mpi_init (
TRY (f->access_prop = hdf5_create_property(H5P_FILE_ACCESS)); TRY (f->access_prop = hdf5_create_property(H5P_FILE_ACCESS));
/* select the HDF5 VFD */ /* select the HDF5 VFD */
#if H5_VERSION_LE(1,8,12)
if (f->mode & H5_VFD_MPIPOSIX) { if (f->mode & H5_VFD_MPIPOSIX) {
h5_info("Selecting MPI-POSIX VFD"); h5_info("Selecting MPI-POSIX VFD");
hbool_t use_gpfs = 0; // TODO autodetect GPFS? hbool_t use_gpfs = 0; // TODO autodetect GPFS?
TRY (hdf5_set_fapl_mpiposix_property(f->access_prop, comm, use_gpfs)); TRY (hdf5_set_fapl_mpiposix_property(f->access_prop, comm, use_gpfs));
} else { } else
#endif
{
h5_info("Selecting MPI-IO VFD"); h5_info("Selecting MPI-IO VFD");
TRY (hdf5_set_fapl_mpio_property(f->access_prop, comm, MPI_INFO_NULL)); TRY (hdf5_set_fapl_mpio_property(f->access_prop, comm, MPI_INFO_NULL));
if (f->mode & H5_VFD_INDEPENDENT) { if (f->mode & H5_VFD_INDEPENDENT) {
+4
View File
@@ -292,7 +292,11 @@ h5_set_throttle (
const int factor const int factor
) { ) {
H5_CORE_API_ENTER (h5_err_t, "f=%p, factor=%d", f, factor); H5_CORE_API_ENTER (h5_err_t, "f=%p, factor=%d", f, factor);
#if H5_VERSION_LE(1,8,12)
if ( (f->mode & H5_VFD_INDEPENDENT) || (f->mode & H5_VFD_MPIPOSIX) ) { if ( (f->mode & H5_VFD_INDEPENDENT) || (f->mode & H5_VFD_MPIPOSIX) ) {
#else
if (f->mode & H5_VFD_INDEPENDENT) {
#endif
f->throttle = factor; f->throttle = factor;
h5_info ("Throttling enabled with factor = %d", f->throttle ); h5_info ("Throttling enabled with factor = %d", f->throttle );
} else { } else {
+3 -4
View File
@@ -547,8 +547,8 @@ h5b_3d_set_view (
p->k_end = k_end; p->k_end = k_end;
_normalize_partition(p); _normalize_partition(p);
#ifdef PARALLEL_IO
h5b_fdata_t *b = f->b; h5b_fdata_t *b = f->b;
#ifdef PARALLEL_IO
h5b_partition_t *user_layout; h5b_partition_t *user_layout;
h5b_partition_t *write_layout; h5b_partition_t *write_layout;
@@ -565,7 +565,6 @@ h5b_3d_set_view (
TRY( _dissolve_ghostzones(f, user_layout, write_layout) ); TRY( _dissolve_ghostzones(f, user_layout, write_layout) );
b->user_layout[0] = user_layout[f->myproc]; b->user_layout[0] = user_layout[f->myproc];
b->write_layout[0] = write_layout[f->myproc]; b->write_layout[0] = write_layout[f->myproc];
b->have_layout = 1;
p = b->user_layout; p = b->user_layout;
h5_debug ( h5_debug (
@@ -587,9 +586,9 @@ h5b_3d_set_view (
h5_free(user_layout); h5_free(user_layout);
h5_free(write_layout); h5_free(write_layout);
TRY( h5bpriv_release_hyperslab(f) );
#endif #endif
TRY( h5bpriv_release_hyperslab(f) );
b->have_layout = 1;
H5_CORE_API_RETURN (H5_SUCCESS); H5_CORE_API_RETURN (H5_SUCCESS);
} }
+2 -1
View File
@@ -9,7 +9,8 @@ _select_hyperslab_for_writing (
/* /*
re-use existing hyperslab re-use existing hyperslab
*/ */
if ( f->b->shape >= 0 ) return H5_SUCCESS; if ( f->b->shape >= 0 )
H5_PRIV_FUNC_LEAVE (H5_SUCCESS);
h5b_fdata_t *b = f->b; h5b_fdata_t *b = f->b;
h5b_partition_t *p = b->write_layout; h5b_partition_t *p = b->write_layout;
+2 -1
View File
@@ -28,7 +28,8 @@ extern "C" {
You can also select a "virtual file driver" in the HDF5 layer using: You can also select a "virtual file driver" in the HDF5 layer using:
- H5_VFD_INDEPENDENT: MPI-IO in independent (asynchronous) mode - H5_VFD_INDEPENDENT: MPI-IO in independent (asynchronous) mode
- H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing MPI-IO - H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing
MPI-IO (only for hdf5 <= 1.8.12)
\return File handle. \return File handle.
\return NULL on error. \return NULL on error.